diff options
| author | Betsy McPhail <betsy.mcphail@kitware.com> | 2021-06-10 12:18:31 -0400 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2022-03-17 09:01:01 -0700 |
| commit | f8782c46d7a5d1caa4fbdbaba9c83bf6c0fcaf08 (patch) | |
| tree | 0956cec0d6d07be67c0fedef9c2aefb0fc250d9e /var | |
| parent | 15ef85e161f84ae199ee773732b230ccafc665c7 (diff) | |
| download | spack-f8782c46d7a5d1caa4fbdbaba9c83bf6c0fcaf08.tar.gz spack-f8782c46d7a5d1caa4fbdbaba9c83bf6c0fcaf08.tar.bz2 spack-f8782c46d7a5d1caa4fbdbaba9c83bf6c0fcaf08.tar.xz spack-f8782c46d7a5d1caa4fbdbaba9c83bf6c0fcaf08.zip | |
Windows: VS and CMake support
Fix: Building packages with CMake is broken (#24241)
vsInstallPaths needs to be renamed vs_install_paths (#24297)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/zlib/package.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index 41da1cadf3..9a445b8173 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -52,8 +52,8 @@ class Zlib(CMakePackage): if '+pic' in self.spec: env.append_flags('CFLAGS', self.compiler.cc_pic_flag) if '+optimize' in self.spec: - env.append_flags('CFLAGS', '-O2') - + env.append_flags('CFLAGS', '-O2') + # Build, install, and check both static and shared versions of the # libraries when +shared @when('+shared platform=windows') @@ -65,7 +65,7 @@ class Zlib(CMakePackage): def build(self, spec, prefix): for self._building_shared in (False, True): super(Zlib, self).build(spec, prefix) - + @when('+shared platform=windows') def check(self): for self._building_shared in (False, True): @@ -80,11 +80,8 @@ class Zlib(CMakePackage): if '~shared' in spec: config_args.append('--static') configure('--prefix={0}'.format(prefix), *config_args) - + make() if self.run_tests: make('check') make('install') - - - |