summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-02-18 20:56:21 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-02-18 20:56:21 (GMT)
commitaff5c20a6ae123dd4250ee46e1cdadbae00fd823 (patch)
tree9bc8c1e2c2cdf4227053fa6beedfe14fb4a9a1a2 /bin
parentdbad502865d8817fe0db94dd6d6b9656ee257790 (diff)
downloadhdf5-aff5c20a6ae123dd4250ee46e1cdadbae00fd823.zip
hdf5-aff5c20a6ae123dd4250ee46e1cdadbae00fd823.tar.gz
hdf5-aff5c20a6ae123dd4250ee46e1cdadbae00fd823.tar.bz2
[svn-r23305] HDFFV-8257: szip still used even if headers are not found. Change configure to test the result of the CHECK HEADERS call before checking for the library.
Tested: local linux, h5committest
Diffstat (limited to 'bin')
-rwxr-xr-xbin/cmakehdf59
1 files changed, 7 insertions, 2 deletions
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5
index cdd75c0..c024ad1 100755
--- a/bin/cmakehdf5
+++ b/bin/cmakehdf5
@@ -58,7 +58,7 @@ EOF
#==========
#==========
cat > $cfgfile <<'EOF'
-cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR)
########################################################
# This dashboard is maintained by The HDF Group
# For any comments please contact cdashhelp@hdfgroup.org
@@ -84,7 +84,12 @@ set (REPOSITORY_URL "http://svn.hdfgroup.uiuc.edu/hdf5/branches/hdf5_1_8")
set (ADD_BUILD_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=/usr/local/hdf5.1.8 -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=\"SVN\" -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
# Use multiple CPU cores to build
-SET (CTEST_BUILD_FLAGS "-j4")
+include(ProcessorCount)
+ProcessorCount(N)
+if(NOT N EQUAL 0)
+ set(CTEST_BUILD_FLAGS -j${N})
+ set(ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
+endif()
# -----------------------------------------------------------
# -- Get environment