diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-05-14 19:51:21 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-05-14 19:51:21 (GMT) |
| commit | 6eaef5ebd61b8019f66f51d3fe74ec3c1b1d4f0f (patch) | |
| tree | 563626838b263454245fef03d8dbe078d1daefec | |
| parent | ef20b65be718774957e395ebc173c5d4d9366996 (diff) | |
| parent | 9406278103a7b72d3eacea9fbeaadbf34bf7e43a (diff) | |
| download | hdf5-6eaef5ebd61b8019f66f51d3fe74ec3c1b1d4f0f.zip hdf5-6eaef5ebd61b8019f66f51d3fe74ec3c1b1d4f0f.tar.gz hdf5-6eaef5ebd61b8019f66f51d3fe74ec3c1b1d4f0f.tar.bz2 | |
Merge pull request #1705 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '9406278103a7b72d3eacea9fbeaadbf34bf7e43a':
Reorder lines in HDF5config.cmake so that additions to end of $HPC-HDF5options scripts will take precedence.
| -rw-r--r-- | config/cmake/scripts/HDF5config.cmake | 4 |
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") |