summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2016-09-20 05:14:37 -0400
committerTodd Gamblin <tgamblin@llnl.gov>2016-09-20 02:14:37 -0700
commit8426b6559244a0062afa201ac7bffe04104724e1 (patch)
tree379af004390d180e6cb6cc01eeaf78b5123dfd77
parent140f1773cfa66bd74b4a859e46b509f43c6a9836 (diff)
downloadspack-8426b6559244a0062afa201ac7bffe04104724e1.tar.gz
spack-8426b6559244a0062afa201ac7bffe04104724e1.tar.bz2
spack-8426b6559244a0062afa201ac7bffe04104724e1.tar.xz
spack-8426b6559244a0062afa201ac7bffe04104724e1.zip
Make cmake @2.8 build again (#1759)
-rw-r--r--var/spack/repos/builtin/packages/cmake/package.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py
index 0c16adcef7..83a68fda07 100644
--- a/var/spack/repos/builtin/packages/cmake/package.py
+++ b/var/spack/repos/builtin/packages/cmake/package.py
@@ -88,11 +88,13 @@ class Cmake(Package):
options = [
'--prefix={0}'.format(prefix),
- '--parallel={0}'.format(make_jobs),
- # jsoncpp requires CMake to build
- # use CMake-provided library to avoid circular dependency
- '--no-system-jsoncpp'
- ]
+ '--parallel={0}'.format(make_jobs)]
+ if spec.satisfies("@3:"):
+ options.append(
+ # jsoncpp requires CMake to build
+ # use CMake-provided library to avoid circular dependency
+ '--no-system-jsoncpp'
+ )
if '+ownlibs' in spec:
# Build and link to the CMake-provided third-party libraries