summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2023-11-03 16:07:42 (GMT)
committerGitHub <noreply@github.com>2023-11-03 16:07:42 (GMT)
commit8113769871f989578d67db6ab9366d995b568ebc (patch)
treeb2f3973907fdd067b578c28847228d917d141ec6
parentf9f2e056c6fc422015000263f30f6f2c02a4789f (diff)
downloadhdf5-8113769871f989578d67db6ab9366d995b568ebc.zip
hdf5-8113769871f989578d67db6ab9366d995b568ebc.tar.gz
hdf5-8113769871f989578d67db6ab9366d995b568ebc.tar.bz2
Adjust some CMake settings (#3828)hdf5_1_12
-rw-r--r--config/cmake/examples/HDF5_Examples.cmake.in1
-rw-r--r--config/cmake/examples/HDF5_Examples_options.cmake13
-rw-r--r--config/cmake/scripts/HDF5options.cmake1
-rw-r--r--doxygen/CMakeLists.txt2
4 files changed, 15 insertions, 2 deletions
diff --git a/config/cmake/examples/HDF5_Examples.cmake.in b/config/cmake/examples/HDF5_Examples.cmake.in
index da2502c..3689059 100644
--- a/config/cmake/examples/HDF5_Examples.cmake.in
+++ b/config/cmake/examples/HDF5_Examples.cmake.in
@@ -29,6 +29,7 @@ set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
#INSTALLDIR - HDF5 root folder
#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
#CTEST_SOURCE_NAME - name of source folder; HDF5Examples
+#CTEST_TOOLCHAIN_FILE - name and path in source of toolchain file
if(DEFINED CTEST_SCRIPT_ARG)
# transform ctest script arguments of the form
# script.ctest,var1=value1,var2=value2
diff --git a/config/cmake/examples/HDF5_Examples_options.cmake b/config/cmake/examples/HDF5_Examples_options.cmake
index cdd49eb..684ec5b 100644
--- a/config/cmake/examples/HDF5_Examples_options.cmake
+++ b/config/cmake/examples/HDF5_Examples_options.cmake
@@ -29,6 +29,19 @@
#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=ON")
#############################################################################################
+#### maximum parallel processor count for build and test ####
+#set(MAX_PROC_COUNT 8)
+
+#############################################################################################
+#### alternate toolsets (Windows usually) ####
+#set(CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 17.0")
+
+#############################################################################################
+### use a toolchain file (supported everywhere) ####
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/clang.cmake")
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/intel.cmake")
+
+#############################################################################################
#### languages ####
### disable C builds
#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_C:BOOL=OFF")
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
index 92bfd37..5d07846 100644
--- a/config/cmake/scripts/HDF5options.cmake
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -26,7 +26,6 @@
#############################################################################################
### use a toolchain file (supported everywhere) ####
-
#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/intel.cmake")
#############################################################################################
diff --git a/doxygen/CMakeLists.txt b/doxygen/CMakeLists.txt
index aa241fb..4c3dbfe 100644
--- a/doxygen/CMakeLists.txt
+++ b/doxygen/CMakeLists.txt
@@ -38,7 +38,7 @@ if (DOXYGEN_FOUND)
install (
DIRECTORY ${HDF5_BINARY_DIR}/hdf5lib_docs/html
DESTINATION ${HDF5_INSTALL_DOC_DIR}
- COMPONENT Documents
+ COMPONENT hdfdocuments
)
if (NOT TARGET doxygen)