From 3266c69352b17bc4d76d59ed9d3cb4869ff5b9ad Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Sat, 26 Jan 2019 09:11:32 -0600 Subject: cmake: Use system libs by default (#10424) This also fixes the libuv version dependency for 3.11+ --- var/spack/repos/builtin/packages/cmake/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 6117a3a72a..3e375354e7 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -50,7 +50,7 @@ class Cmake(Package): version('3.0.2', 'db4c687a31444a929d2fdc36c4dfb95f') version('2.8.10.2', '097278785da7182ec0aea8769d06860c') - variant('ownlibs', default=True, description='Use CMake-provided third-party libraries') + variant('ownlibs', default=False, description='Use CMake-provided third-party libraries') variant('qt', default=False, description='Enables the build of cmake-gui') variant('doc', default=False, description='Enables the generation of html and man page documentation') variant('openssl', default=True, description="Enables CMake's OpenSSL features") @@ -63,7 +63,8 @@ class Cmake(Package): depends_on('bzip2', when='~ownlibs') depends_on('xz', when='~ownlibs') depends_on('libarchive', when='~ownlibs') - depends_on('libuv@1.0.0:', when='~ownlibs') + depends_on('libuv@1.0.0:', when='@3.7.0:3.10.3~ownlibs') + depends_on('libuv@1.10.0:', when='@3.11.0:~ownlibs') depends_on('rhash', when='@3.8.0:~ownlibs') depends_on('qt', when='+qt') depends_on('python@2.7.11:', when='+doc', type='build') -- cgit v1.2.3-70-g09d2