summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/cmake/fileCompareTest.cmake4
-rw-r--r--config/cmake/hdf5-config.cmake.in13
-rw-r--r--config/cmake/patch.xml.in (renamed from config/cmake/patch.xml)2
-rw-r--r--config/cmake/runTest.cmake4
-rw-r--r--config/cmake/scripts/HDF5options.cmake6
-rw-r--r--config/sanitizer/README.md2
-rw-r--r--config/toolchain/build32.cmake2
-rw-r--r--config/toolchain/clang.cmake16
-rw-r--r--config/toolchain/crayle.cmake10
-rw-r--r--config/toolchain/gcc.cmake12
-rw-r--r--config/toolchain/mingw64.cmake2
-rw-r--r--config/toolchain/pgi.cmake12
12 files changed, 48 insertions, 37 deletions
diff --git a/config/cmake/fileCompareTest.cmake b/config/cmake/fileCompareTest.cmake
index 4a8dc09..f4c46f6 100644
--- a/config/cmake/fileCompareTest.cmake
+++ b/config/cmake/fileCompareTest.cmake
@@ -59,7 +59,7 @@ if (TEST_STRINGS STREQUAL "YES")
endif ()
else ()
if (CMAKE_VERSION VERSION_LESS "3.14.0")
- message (FATAL_ERROR "CANNOT get file size, file command SIZE not supported")
+ message (STATUS "CANNOT get file size, file command SIZE not supported")
else ()
file (SIZE ${TEST_FOLDER}/${TEST_ONEFILE} TEST_ONE_SIZE)
file (SIZE ${TEST_FOLDER}/${TEST_TWOFILE} TEST_TWO_SIZE)
@@ -74,7 +74,7 @@ else ()
elseif (TEST_FUNCTION MATCHES "LTEQ")
if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
- message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+ message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
endif ()
else ()
message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
index 699db89..496d260 100644
--- a/config/cmake/hdf5-config.cmake.in
+++ b/config/cmake/hdf5-config.cmake.in
@@ -44,6 +44,7 @@ set (${HDF5_PACKAGE_NAME}_ENABLE_PLUGIN_SUPPORT @HDF5_ENABLE_PLUGIN_SUPPORT@)
set (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)
set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT @HDF5_ENABLE_SZIP_SUPPORT@)
set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)
+set (${HDF5_PACKAGE_NAME}_ENABLE_ROS3_VFD @HDF5_ENABLE_ROS3_VFD@)
set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS @H5_ENABLE_SHARED_LIB@)
set (${HDF5_PACKAGE_NAME}_BUILD_STATIC_LIBS @H5_ENABLE_STATIC_LIB@)
set (${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS @HDF5_PACKAGE_EXTLIBS@)
@@ -51,7 +52,8 @@ set (${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES @HDF5_LIBRARIES_TO_EXPORT@)
set (${HDF5_PACKAGE_NAME}_ARCHITECTURE "@CMAKE_GENERATOR_ARCHITECTURE@")
set (${HDF5_PACKAGE_NAME}_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
set (${HDF5_PACKAGE_NAME}_DEFAULT_API_VERSION "@DEFAULT_API_VERSION@")
-set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES "@PARALLEL_FILTERED_WRITES@")
+set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES @PARALLEL_FILTERED_WRITES@)
+set (${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN "@HDF5_INSTALL_MOD_FORTRAN@")
#-----------------------------------------------------------------------------
# Dependencies
@@ -67,6 +69,11 @@ if (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL)
find_package(MPI QUIET REQUIRED)
endif ()
+if (${HDF5_PACKAGE_NAME}_ENABLE_THREADSAFE)
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads QUIET REQUIRED)
+endif ()
+
if (${HDF5_PACKAGE_NAME}_BUILD_JAVA)
set (${HDF5_PACKAGE_NAME}_JAVA_INCLUDE_DIRS
@PACKAGE_CURRENT_BUILD_DIR@/lib/jarhdf5-@HDF5_VERSION_STRING@.jar
@@ -143,14 +150,14 @@ foreach (comp IN LISTS ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
list (REMOVE_ITEM ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS ${comp})
set (${HDF5_PACKAGE_NAME}_LIB_TYPE ${${HDF5_PACKAGE_NAME}_LIB_TYPE} ${comp})
- if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
+ if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN AND ${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN STREQUAL "SHARED")
set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@/shared")
endif ()
elseif (comp STREQUAL "static")
list (REMOVE_ITEM ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS ${comp})
set (${HDF5_PACKAGE_NAME}_LIB_TYPE ${${HDF5_PACKAGE_NAME}_LIB_TYPE} ${comp})
- if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
+ if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN AND ${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN STREQUAL "STATIC")
set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@/static")
endif ()
endif ()
diff --git a/config/cmake/patch.xml b/config/cmake/patch.xml.in
index 1bdff3e..d6843e1 100644
--- a/config/cmake/patch.xml
+++ b/config/cmake/patch.xml.in
@@ -1,5 +1,5 @@
<CPackWiXPatch>
- <CPackWiXFragment Id="CM_CP_libraries.bin.hdf5.dll">
+ <CPackWiXFragment Id="CM_CP_libraries.bin.@WIX_CMP_NAME@.dll">
<Environment Id="PATH"
Name="PATH"
Value="[CM_DP_libraries.bin]"
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake
index e26b8ea..b8abe92 100644
--- a/config/cmake/runTest.cmake
+++ b/config/cmake/runTest.cmake
@@ -122,6 +122,10 @@ if (NOT TEST_RESULT EQUAL TEST_EXPECT)
file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
message (STATUS "Output :\n${TEST_STREAM}")
endif ()
+ if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+ file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+ message (STATUS "Error Output :\n${TEST_STREAM}")
+ endif ()
endif ()
message (FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
endif ()
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
index 5267212..92bfd37 100644
--- a/config/cmake/scripts/HDF5options.cmake
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -69,9 +69,9 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN
### disable using ext zlib
#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF")
-### enable using ext szip
-#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
-#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+### disable using ext szip
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")
#### package examples ####
#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-2.0.3-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}")
diff --git a/config/sanitizer/README.md b/config/sanitizer/README.md
index 308f9c3..b33c100 100644
--- a/config/sanitizer/README.md
+++ b/config/sanitizer/README.md
@@ -304,4 +304,4 @@ file(GLOB_RECURSE CMAKE_FILES
)
cmake_format(TARGET_NAME ${CMAKE_FILES})
-``` \ No newline at end of file
+```
diff --git a/config/toolchain/build32.cmake b/config/toolchain/build32.cmake
index a2566c3..f636ea8 100644
--- a/config/toolchain/build32.cmake
+++ b/config/toolchain/build32.cmake
@@ -42,7 +42,7 @@ elseif(MINGW)
set (CMAKE_CROSSCOMPILING_EMULATOR wine)
include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
- set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
+ set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
else ()
set (CMAKE_SYSTEM_NAME Linux)
diff --git a/config/toolchain/clang.cmake b/config/toolchain/clang.cmake
index af176aa..2d35641 100644
--- a/config/toolchain/clang.cmake
+++ b/config/toolchain/clang.cmake
@@ -1,16 +1,16 @@
# Uncomment the following to use cross-compiling
-#set(CMAKE_SYSTEM_NAME Linux)
+#set (CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_COMPILER_VENDOR "clang")
+set (CMAKE_COMPILER_VENDOR "clang")
if(WIN32)
- set(CMAKE_C_COMPILER clang-cl)
- set(CMAKE_CXX_COMPILER clang-cl)
+ set (CMAKE_C_COMPILER clang-cl)
+ set (CMAKE_CXX_COMPILER clang-cl)
else()
- set(CMAKE_C_COMPILER clang)
- set(CMAKE_CXX_COMPILER clang++)
+ set (CMAKE_C_COMPILER clang)
+ set (CMAKE_CXX_COMPILER clang++)
endif()
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
# the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/crayle.cmake b/config/toolchain/crayle.cmake
index bf7cf69..02df8ff 100644
--- a/config/toolchain/crayle.cmake
+++ b/config/toolchain/crayle.cmake
@@ -1,10 +1,10 @@
# The following line will use cross-compiling
-set(CMAKE_SYSTEM_NAME Linux)
+set (CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_COMPILER_VENDOR "CrayLinuxEnvironment")
+set (CMAKE_COMPILER_VENDOR "CrayLinuxEnvironment")
-set(CMAKE_C_COMPILER cc)
-set(CMAKE_Fortran_COMPILER ftn)
+set (CMAKE_C_COMPILER cc)
+set (CMAKE_Fortran_COMPILER ftn)
# the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/gcc.cmake b/config/toolchain/gcc.cmake
index c41d0ca..f0771ed 100644
--- a/config/toolchain/gcc.cmake
+++ b/config/toolchain/gcc.cmake
@@ -1,11 +1,11 @@
# Uncomment the following line and the correct system name to use cross-compiling
-#set(CMAKE_SYSTEM_NAME Linux)
+#set (CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_COMPILER_VENDOR "GCC")
+set (CMAKE_COMPILER_VENDOR "GCC")
-set(CMAKE_C_COMPILER cc)
-set(CMAKE_CXX_COMPILER c++)
-set(CMAKE_Fortran_COMPILER gfortran)
+set (CMAKE_C_COMPILER cc)
+set (CMAKE_CXX_COMPILER c++)
+set (CMAKE_Fortran_COMPILER gfortran)
# the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/mingw64.cmake b/config/toolchain/mingw64.cmake
index 1830488..1b13891 100644
--- a/config/toolchain/mingw64.cmake
+++ b/config/toolchain/mingw64.cmake
@@ -11,4 +11,4 @@ set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set (CMAKE_CROSSCOMPILING_EMULATOR wine64)
include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
+set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
diff --git a/config/toolchain/pgi.cmake b/config/toolchain/pgi.cmake
index ec58cbb..ff2f048 100644
--- a/config/toolchain/pgi.cmake
+++ b/config/toolchain/pgi.cmake
@@ -1,11 +1,11 @@
# Uncomment the following to use cross-compiling
-#set(CMAKE_SYSTEM_NAME Linux)
+#set (CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_COMPILER_VENDOR "PGI")
+set (CMAKE_COMPILER_VENDOR "PGI")
-set(CMAKE_C_COMPILER pgcc)
-set(CMAKE_CXX_COMPILER pgc++)
-set(CMAKE_Fortran_COMPILER pgf90)
+set (CMAKE_C_COMPILER pgcc)
+set (CMAKE_CXX_COMPILER pgc++)
+set (CMAKE_Fortran_COMPILER pgf90)
# the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")
generated by cgit v0.12 at 2024-07-01 10:13:35 (GMT)