summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-05-14 18:52:25 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-05-14 18:52:25 (GMT)
commit9406278103a7b72d3eacea9fbeaadbf34bf7e43a (patch)
tree563626838b263454245fef03d8dbe078d1daefec /config
parentef20b65be718774957e395ebc173c5d4d9366996 (diff)
downloadhdf5-9406278103a7b72d3eacea9fbeaadbf34bf7e43a.zip
hdf5-9406278103a7b72d3eacea9fbeaadbf34bf7e43a.tar.gz
hdf5-9406278103a7b72d3eacea9fbeaadbf34bf7e43a.tar.bz2
Reorder lines in HDF5config.cmake so that additions to end of $HPC-HDF5options scripts will take precedence.
Diffstat (limited to 'config')
-rw-r--r--config/cmake/scripts/HDF5config.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 3ae48ce..44ed531 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -179,7 +179,6 @@ if (NOT DEFINED HPC)
else ()
set (CTEST_SITE "${SITE_OS_NAME}")
set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
- include (${CTEST_SOURCE_DIRECTORY}/config/cmake/scripts/HPC/${HPC}-HDF5options.cmake)
endif ()
###################################################################
@@ -229,6 +228,9 @@ if (WIN32)
else ()
set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
include (${CTEST_SCRIPT_DIRECTORY}/HDF5options.cmake)
+ if (DEFINED HPC)
+ include (${CTEST_SOURCE_DIRECTORY}/config/cmake/scripts/HPC/${HPC}-HDF5options.cmake)
+ endif ()
include (${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
if (APPLE)
if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg")