diff options
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 59 | ||||
| -rw-r--r-- | config/cmake/LIBAEC/CMakeLists.txt | 51 | ||||
| -rw-r--r-- | config/cmake/ZLIB/CMakeLists.txt | 49 | ||||
| -rw-r--r-- | config/cmake/examples/HDF5_Examples.cmake.in | 1 | ||||
| -rw-r--r-- | config/cmake/scripts/CTestScript.cmake | 5 |
5 files changed, 44 insertions, 121 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 3d4c23b..8013363 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -872,35 +872,46 @@ if (HDF5_BUILD_FORTRAN) endif() #----------------------------------------------------------------------------- -# Macro to determine the various conversion capabilities +# Macro to determine long double conversion properties #----------------------------------------------------------------------------- -macro (H5ConversionTests TEST msg) +macro (H5ConversionTests TEST def msg) if (NOT DEFINED ${TEST}) - TRY_RUN (${TEST}_RUN ${TEST}_COMPILE - ${CMAKE_BINARY_DIR} - ${HDF_RESOURCES_DIR}/ConversionTests.c - CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=-D${TEST}_TEST - OUTPUT_VARIABLE OUTPUT - ) - if (${TEST}_COMPILE) - if (${TEST}_RUN EQUAL "0") - set (${TEST} 1 CACHE INTERNAL ${msg}) - message (VERBOSE "${msg}... yes") + if (NOT CMAKE_CROSSCOMPILING) + # Build and run the test code if not cross-compiling + TRY_RUN (${TEST}_RUN ${TEST}_COMPILE + ${CMAKE_BINARY_DIR} + ${HDF_RESOURCES_DIR}/ConversionTests.c + CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=-D${TEST}_TEST + OUTPUT_VARIABLE OUTPUT + ) + if (${TEST}_COMPILE) + if (${TEST}_RUN EQUAL "0") + set (${TEST} 1 CACHE INTERNAL ${msg}) + message (VERBOSE "${msg}... yes") + else () + set (${TEST} "" CACHE INTERNAL ${msg}) + message (VERBOSE "${msg}... no") + file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log + "Test ${TEST} Run failed with the following output and exit code:\n ${OUTPUT}\n" + ) + endif () else () set (${TEST} "" CACHE INTERNAL ${msg}) message (VERBOSE "${msg}... no") file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log - "Test ${TEST} Run failed with the following output and exit code:\n ${OUTPUT}\n" + "Test ${TEST} Compile failed with the following output:\n ${OUTPUT}\n" ) endif () else () - set (${TEST} "" CACHE INTERNAL ${msg}) - message (VERBOSE "${msg}... no") - file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log - "Test ${TEST} Compile failed with the following output:\n ${OUTPUT}\n" - ) + # Use the default if there's no cache variable and cross-compiling + if (${def}) + message (VERBOSE "${msg}... yes (cross-compile default)") + set (${TEST} 1 CACHE INTERNAL ${msg}) + else () + message (VERBOSE "${msg}... no (cross-compile default)") + set (${TEST} "" CACHE INTERNAL ${msg}) + endif () endif () - endif () endmacro () @@ -917,7 +928,7 @@ endmacro () # The machine's conversion gets the correct value. We define the macro and disable # this kind of test until we figure out what algorithm they use. #----------------------------------------------------------------------------- -H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LONG_SPECIAL "Checking IF your system converts long double to (unsigned) long values with special algorithm") +H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LONG_SPECIAL FALSE "Checking IF your system converts long double to (unsigned) long values with special algorithm") # ---------------------------------------------------------------------- # Set the flag to indicate that the machine is using a special algorithm # to convert some values of '(unsigned) long' to 'long double' values. @@ -926,7 +937,7 @@ H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LONG_SPECIAL "Checking IF your syst # ..., 7fffff..., the compiler uses a unknown algorithm. We define a # macro and skip the test for now until we know about the algorithm. #----------------------------------------------------------------------------- -H5ConversionTests (${HDF_PREFIX}_LONG_TO_LDOUBLE_SPECIAL "Checking IF your system can convert (unsigned) long to long double values with special algorithm") +H5ConversionTests (${HDF_PREFIX}_LONG_TO_LDOUBLE_SPECIAL FALSE "Checking IF your system can convert (unsigned) long to long double values with special algorithm") # ---------------------------------------------------------------------- # Set the flag to indicate that the machine can accurately convert # 'long double' to '(unsigned) long long' values. (This flag should be set for @@ -936,7 +947,7 @@ H5ConversionTests (${HDF_PREFIX}_LONG_TO_LDOUBLE_SPECIAL "Checking IF your syste # 0x4351ccf385ebc8a0dfcc... or 0x4351ccf385ebc8a0ffcc... will make the converted # values wildly wrong. This test detects this wrong behavior and disable the test. #----------------------------------------------------------------------------- -H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LLONG_ACCURATE "Checking IF correctly converting long double to (unsigned) long long values") +H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LLONG_ACCURATE TRUE "Checking IF correctly converting long double to (unsigned) long long values") # ---------------------------------------------------------------------- # Set the flag to indicate that the machine can accurately convert # '(unsigned) long long' to 'long double' values. (This flag should be set for @@ -944,9 +955,9 @@ H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LLONG_ACCURATE "Checking IF correctl # 007fff..., 00ffff..., 01ffff..., ..., 7fffff..., the converted values are twice # as big as they should be. #----------------------------------------------------------------------------- -H5ConversionTests (${HDF_PREFIX}_LLONG_TO_LDOUBLE_CORRECT "Checking IF correctly converting (unsigned) long long to long double values") +H5ConversionTests (${HDF_PREFIX}_LLONG_TO_LDOUBLE_CORRECT TRUE "Checking IF correctly converting (unsigned) long long to long double values") # ---------------------------------------------------------------------- # Set the flag to indicate that the machine can accurately convert # some long double values #----------------------------------------------------------------------------- -H5ConversionTests (${HDF_PREFIX}_DISABLE_SOME_LDOUBLE_CONV "Checking IF the cpu is power9 and cannot correctly converting long double values") +H5ConversionTests (${HDF_PREFIX}_DISABLE_SOME_LDOUBLE_CONV FALSE "Checking IF the cpu is power9 and cannot correctly converting long double values") diff --git a/config/cmake/LIBAEC/CMakeLists.txt b/config/cmake/LIBAEC/CMakeLists.txt index 9ffb68d..a819587 100644 --- a/config/cmake/LIBAEC/CMakeLists.txt +++ b/config/cmake/LIBAEC/CMakeLists.txt @@ -172,7 +172,7 @@ target_link_libraries (${LIBAEC_LIB_TARGET} PRIVATE ${LINK_LIBS}) H5_SET_LIB_OPTIONS (${LIBAEC_LIB_TARGET} ${LIBAEC_LIB_NAME} STATIC 0) set_target_properties (${LIBAEC_LIB_TARGET} PROPERTIES VERSION 0.0.12 SOVERSION 0 - PUBLIC_HEADER "${LIBAEC_PUBLIC_HEADERS}" + PUBLIC_HEADER "" LINKER_LANGUAGE C INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) @@ -194,7 +194,7 @@ target_link_libraries (${SZIP_LIB_TARGET} PRIVATE ${LIBAEC_LIB_TARGET}) H5_SET_LIB_OPTIONS (${SZIP_LIB_TARGET} ${SZIP_LIB_NAME} STATIC 0) set_target_properties (${SZIP_LIB_TARGET} PROPERTIES VERSION 2.0.1 SOVERSION 2 - PUBLIC_HEADER "${SZIP_PUBLIC_HEADERS}" + PUBLIC_HEADER "" LINKER_LANGUAGE C INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) @@ -235,17 +235,6 @@ if (WIN32) endif () #----------------------------------------------------------------------------- -# Add file(s) to CMake Install -#----------------------------------------------------------------------------- -#if (NOT LIBAEC_INSTALL_NO_DEVELOPMENT) -# install ( -# FILES ${PROJECT_BINARY_DIR}/aec_config.h -# DESTINATION ${LIBAEC_INSTALL_INCLUDE_DIR} -# COMPONENT headers -# ) -#endif () - -#----------------------------------------------------------------------------- # Add Target(s) to CMake Install for import into other projects #----------------------------------------------------------------------------- if (NOT LIBAEC_EXTERNALLY_CONFIGURED) @@ -334,20 +323,6 @@ if (NOT LIBAEC_EXTERNALLY_CONFIGURED) endif () #----------------------------------------------------------------------------- -# Add Document File(s) to CMake Install -#----------------------------------------------------------------------------- -if (NOT LIBAEC_EXTERNALLY_CONFIGURED) - install ( - FILES - ${LIBAEC_SOURCE_DIR}/README.md - ${LIBAEC_SOURCE_DIR}/INSTALL.md - ${LIBAEC_SOURCE_DIR}/CHANGELOG.md - DESTINATION ${LIBAEC_INSTALL_DATA_DIR} - COMPONENT documents - ) -endif () - -#----------------------------------------------------------------------------- # Check for Installation Utilities #----------------------------------------------------------------------------- if (WIN32) @@ -464,7 +439,6 @@ if (NOT LIBAEC_EXTERNALLY_CONFIGURED) include (InstallRequiredSystemLibraries) set (CPACK_INSTALL_CMAKE_PROJECTS "${LIBAEC_BINARY_DIR};LIBAEC;libraries;/") - set (CPACK_INSTALL_CMAKE_PROJECTS "${LIBAEC_BINARY_DIR};LIBAEC;headers;/") set (CPACK_INSTALL_CMAKE_PROJECTS "${LIBAEC_BINARY_DIR};LIBAEC;configinstall;/") set (CPACK_ALL_INSTALL_TYPES Full Developer User) @@ -476,33 +450,12 @@ if (NOT LIBAEC_EXTERNALLY_CONFIGURED) cpack_add_component_group(Runtime) - cpack_add_component_group(Documents - EXPANDED - DESCRIPTION "Release notes for libaec" - ) - - cpack_add_component_group(Development - EXPANDED - DESCRIPTION "All of the tools you'll need to develop applications" - ) - cpack_add_component (libraries DISPLAY_NAME "LIBAEC Libraries" REQUIRED GROUP Runtime INSTALL_TYPES Full Developer User ) - cpack_add_component (headers - DISPLAY_NAME "LIBAEC Headers" - DEPENDS libraries - GROUP Development - INSTALL_TYPES Full Developer - ) - cpack_add_component (documents - DISPLAY_NAME "LIBAEC Documents" - GROUP Documents - INSTALL_TYPES Full Developer - ) cpack_add_component (configinstall DISPLAY_NAME "LIBAEC CMake files" DEPENDS libraries diff --git a/config/cmake/ZLIB/CMakeLists.txt b/config/cmake/ZLIB/CMakeLists.txt index 5c06a54..d4b3924 100644 --- a/config/cmake/ZLIB/CMakeLists.txt +++ b/config/cmake/ZLIB/CMakeLists.txt @@ -247,7 +247,7 @@ TARGET_C_PROPERTIES (${ZLIB_LIB_TARGET} STATIC) target_link_libraries (${ZLIB_LIB_TARGET} PRIVATE ${LINK_LIBS}) H5_SET_LIB_OPTIONS (${ZLIB_LIB_TARGET} ${ZLIB_LIB_NAME} STATIC 0) set_target_properties(${ZLIB_LIB_TARGET} PROPERTIES - PUBLIC_HEADER "${ZLIB_PUBLIC_HEADERS}" + PUBLIC_HEADER "" LINKER_LANGUAGE C INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) @@ -288,17 +288,6 @@ if (WIN32) endif () #----------------------------------------------------------------------------- -# Add file(s) to CMake Install -#----------------------------------------------------------------------------- -if (NOT ZLIB_INSTALL_NO_DEVELOPMENT) - install ( - FILES ${PROJECT_BINARY_DIR}/zconf.h - DESTINATION ${ZLIB_INSTALL_INCLUDE_DIR} - COMPONENT headers - ) -endif () - -#----------------------------------------------------------------------------- # Add Target(s) to CMake Install for import into other projects #----------------------------------------------------------------------------- if (NOT ZLIB_EXTERNALLY_CONFIGURED) @@ -387,20 +376,6 @@ if (NOT ZLIB_EXTERNALLY_CONFIGURED) endif () #----------------------------------------------------------------------------- -# Add Document File(s) to CMake Install -#----------------------------------------------------------------------------- -if (NOT ZLIB_EXTERNALLY_CONFIGURED) - install ( - FILES - ${ZLIB_SOURCE_DIR}/FAQ - ${ZLIB_SOURCE_DIR}/README - ${ZLIB_SOURCE_DIR}/INDEX - DESTINATION ${ZLIB_INSTALL_DATA_DIR} - COMPONENT documents - ) -endif () - -#----------------------------------------------------------------------------- # Check for Installation Utilities #----------------------------------------------------------------------------- if (WIN32) @@ -523,7 +498,6 @@ if (NOT ZLIB_EXTERNALLY_CONFIGURED) include (InstallRequiredSystemLibraries) set (CPACK_INSTALL_CMAKE_PROJECTS "${ZLIB_BINARY_DIR};ZLIB;libraries;/") - set (CPACK_INSTALL_CMAKE_PROJECTS "${ZLIB_BINARY_DIR};ZLIB;headers;/") set (CPACK_INSTALL_CMAKE_PROJECTS "${ZLIB_BINARY_DIR};ZLIB;configinstall;/") set (CPACK_ALL_INSTALL_TYPES Full Developer User) @@ -535,33 +509,12 @@ if (NOT ZLIB_EXTERNALLY_CONFIGURED) cpack_add_component_group(Runtime) - cpack_add_component_group(Documents - EXPANDED - DESCRIPTION "Release notes for zlib" - ) - - cpack_add_component_group(Development - EXPANDED - DESCRIPTION "All of the tools you'll need to develop applications" - ) - cpack_add_component (libraries DISPLAY_NAME "ZLIB Libraries" REQUIRED GROUP Runtime INSTALL_TYPES Full Developer User ) - cpack_add_component (headers - DISPLAY_NAME "ZLIB Headers" - DEPENDS libraries - GROUP Development - INSTALL_TYPES Full Developer - ) - cpack_add_component (documents - DISPLAY_NAME "ZLIB Documents" - GROUP Documents - INSTALL_TYPES Full Developer - ) cpack_add_component (configinstall DISPLAY_NAME "ZLIB CMake files" DEPENDS libraries diff --git a/config/cmake/examples/HDF5_Examples.cmake.in b/config/cmake/examples/HDF5_Examples.cmake.in index 8f28aae..9c99719 100644 --- a/config/cmake/examples/HDF5_Examples.cmake.in +++ b/config/cmake/examples/HDF5_Examples.cmake.in @@ -78,6 +78,7 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDN ############################################################################################################### set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ROOT:PATH=${INSTALLDIR}") +set (ENV{HDF5_ROOT} "${INSTALLDIR}") if(WIN32) set(SITE_OS_NAME "Windows") set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build) diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake index 2a57db8..37bf0d4 100644 --- a/config/cmake/scripts/CTestScript.cmake +++ b/config/cmake/scripts/CTestScript.cmake @@ -184,6 +184,11 @@ list (APPEND CTEST_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}" "${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake" ) +if (EXISTS "${CTEST_SCRIPT_DIRECTORY}/SkipTests.log") + list(APPEND CTEST_NOTES_FILES + "${CTEST_SCRIPT_DIRECTORY}/SkipTests.log" + ) +endif () #----------------------------------------------------------------------------- # Check for required variables. |