diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-10-25 15:50:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-25 15:50:43 (GMT) |
| commit | ea902f9acefec5303cb3e3527d4472e97956a122 (patch) | |
| tree | 80be2bb4a7e373a81d8bde511e361d3cd8bfcdca /config/cmake/scripts | |
| parent | f98c93ab193bd7258f165de8c61a1809087975ee (diff) | |
| download | hdf5-ea902f9acefec5303cb3e3527d4472e97956a122.zip hdf5-ea902f9acefec5303cb3e3527d4472e97956a122.tar.gz hdf5-ea902f9acefec5303cb3e3527d4472e97956a122.tar.bz2 | |
Implement option for using CMake GNUInstallDirs (#2175)
* Implement option for using CMake GNUInstallDirs
* Add release notes
Diffstat (limited to 'config/cmake/scripts')
| -rw-r--r-- | config/cmake/scripts/CTestScript.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/scripts/HDF5options.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake index f1dd662..76bab18 100644 --- a/config/cmake/scripts/CTestScript.cmake +++ b/config/cmake/scripts/CTestScript.cmake @@ -51,7 +51,7 @@ endif () set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}") # Launchers work only with Makefile and Ninja generators. -if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja") +if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja" OR LOCAL_SKIP_TEST) set(CTEST_USE_LAUNCHERS 0) set(ENV{CTEST_USE_LAUNCHERS_DEFAULT} 0) set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=OFF") diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake index bab60de..7a5d327 100644 --- a/config/cmake/scripts/HDF5options.cmake +++ b/config/cmake/scripts/HDF5options.cmake @@ -96,6 +96,7 @@ endif() ############################################################################################# ### disable test program builds +#If using CTestScript.cmake file be sure to uncomment set (LOCAL_SKIP_TEST "TRUE") #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=OFF") ############################################################################################# |