From f8782c46d7a5d1caa4fbdbaba9c83bf6c0fcaf08 Mon Sep 17 00:00:00 2001 From: Betsy McPhail Date: Thu, 10 Jun 2021 12:18:31 -0400 Subject: Windows: VS and CMake support Fix: Building packages with CMake is broken (#24241) vsInstallPaths needs to be renamed vs_install_paths (#24297) --- var/spack/repos/builtin/packages/zlib/package.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'var') 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') - - - -- cgit v1.2.3-70-g09d2