From 36a2a8d5ae073d0b2c6d7c61cc9adc830886cc56 Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Mon, 5 Jun 2023 18:19:11 -0500 Subject: Fix multiConfig variable usage and remove unused CMake vars (#3051) --- CMakeLists.txt | 10 ---------- config/cmake/HDF5PluginMacros.cmake | 1 + config/cmake/HDF5_Examples.cmake.in | 5 +++++ config/cmake/HDFCompilerFlags.cmake | 1 + config/cmake/HDFMacros.cmake | 2 +- config/cmake/LIBAEC/CMakeLists.txt | 10 ---------- config/cmake/ZLIB/CMakeLists.txt | 10 ---------- config/cmake/grepTest.cmake | 2 ++ config/cmake/jrunTest.cmake | 2 ++ config/cmake/runTest.cmake | 2 ++ 10 files changed, 14 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20db72e..785c97b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -629,16 +629,6 @@ if (MSVC) set (WIN_LINK_FLAGS "") endif () -set (MAKE_SYSTEM) -if (CMAKE_MAKE_PROGRAM MATCHES "make") - set (MAKE_SYSTEM 1) -endif () - -set (CFG_INIT "/${CMAKE_CFG_INTDIR}") -if (MAKE_SYSTEM) - set (CFG_INIT "") -endif () - # Do not generate test programs by default option (HDF5_BUILD_GENERATORS "Build Test Generators" OFF) diff --git a/config/cmake/HDF5PluginMacros.cmake b/config/cmake/HDF5PluginMacros.cmake index d4270ed..e2ace24 100644 --- a/config/cmake/HDF5PluginMacros.cmake +++ b/config/cmake/HDF5PluginMacros.cmake @@ -88,6 +88,7 @@ macro (FILTER_OPTION plname) option (ENABLE_${plname} "Enable Library Building for ${plname} plugin" ON) if (ENABLE_${plname}) option (HDF_${plname}_USE_EXTERNAL "Use External Library Building for ${PLUGIN_NAME} plugin" 0) + mark_as_advanced (HDF_${plname}_USE_EXTERNAL) if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") set (HDF_${plname}_USE_EXTERNAL 1 CACHE BOOL "Use External Library Building for ${PLUGIN_NAME} plugin" FORCE) if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT") diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in index 21a1dbb..9f3db03 100644 --- a/config/cmake/HDF5_Examples.cmake.in +++ b/config/cmake/HDF5_Examples.cmake.in @@ -87,6 +87,11 @@ if(WIN32) set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build) set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}") set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}") +else(APPLE) + set(ENV{DYLD_LIBRARY_PATH} "${INSTALLDIR}/lib") + set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build) + set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}") + set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}") else() set(ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib") set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build) diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake index 48c8132..88670d7 100644 --- a/config/cmake/HDFCompilerFlags.cmake +++ b/config/cmake/HDFCompilerFlags.cmake @@ -66,6 +66,7 @@ if (CMAKE_COMPILER_IS_GNUCC) # This should NOT be on by default as it can cause process issues. #----------------------------------------------------------------------------- option (HDF5_ENABLE_BUILD_DIAGS "Enable color and URL extended diagnostic messages" OFF) + mark_as_advanced (HDF5_ENABLE_BUILD_DIAGS) if (HDF5_ENABLE_BUILD_DIAGS) message (STATUS "... default color and URL extended diagnostic messages enabled") else () diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index 7f94d59..42b6a22 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -21,7 +21,7 @@ macro (SET_HDF_BUILD_TYPE) set (HDF_CFG_NAME ${CMAKE_BUILD_TYPE}) else () # set the default to the MultiConfig variable - set (HDF_CFG_NAME ${CMAKE_CFG_INTDIR}) + set (HDF_CFG_NAME "$") endif () else () set (HDF_CFG_BUILD_TYPE ".") diff --git a/config/cmake/LIBAEC/CMakeLists.txt b/config/cmake/LIBAEC/CMakeLists.txt index fb650ec..53950d8 100644 --- a/config/cmake/LIBAEC/CMakeLists.txt +++ b/config/cmake/LIBAEC/CMakeLists.txt @@ -123,16 +123,6 @@ if (MSVC) set (CMAKE_MFC_FLAG 0) endif () -set (MAKE_SYSTEM) -if (CMAKE_BUILD_TOOL MATCHES "make") - set (MAKE_SYSTEM 1) -endif () - -set (CFG_INIT "/${CMAKE_CFG_INTDIR}") -if (MAKE_SYSTEM) - set (CFG_INIT "") -endif () - #----------------------------------------------------------------------------- # Compiler specific flags : Shouldn't there be compiler tests for these #----------------------------------------------------------------------------- diff --git a/config/cmake/ZLIB/CMakeLists.txt b/config/cmake/ZLIB/CMakeLists.txt index 5e42fb2..12411ac 100644 --- a/config/cmake/ZLIB/CMakeLists.txt +++ b/config/cmake/ZLIB/CMakeLists.txt @@ -125,16 +125,6 @@ if (MSVC) set (CMAKE_MFC_FLAG 0) endif () -set (MAKE_SYSTEM) -if (CMAKE_BUILD_TOOL MATCHES "make") - set (MAKE_SYSTEM 1) -endif () - -set (CFG_INIT "/${CMAKE_CFG_INTDIR}") -if (MAKE_SYSTEM) - set (CFG_INIT "") -endif () - #----------------------------------------------------------------------------- # Compiler specific flags : Shouldn't there be compiler tests for these #----------------------------------------------------------------------------- diff --git a/config/cmake/grepTest.cmake b/config/cmake/grepTest.cmake index 3b0baf5..9dcedb5 100644 --- a/config/cmake/grepTest.cmake +++ b/config/cmake/grepTest.cmake @@ -42,6 +42,8 @@ message (STATUS "COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}") if (TEST_LIBRARY_DIRECTORY) if (WIN32) set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}") + elseif (APPLE) + set (ENV{DYLD_LIBRARY_PATH} "$ENV{DYLD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") else () set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") endif () diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake index bbf1191..f2d15eb 100644 --- a/config/cmake/jrunTest.cmake +++ b/config/cmake/jrunTest.cmake @@ -51,6 +51,8 @@ message (STATUS "COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defa if (WIN32) set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}") +elseif (APPLE) + set (ENV{DYLD_LIBRARY_PATH} "$ENV{DYLD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") else () set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") endif () diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake index ad72a9e..e26b8ea 100644 --- a/config/cmake/runTest.cmake +++ b/config/cmake/runTest.cmake @@ -40,6 +40,8 @@ message (STATUS "COMMAND: ${TEST_EMULATOR} ${TEST_PROGRAM} ${TEST_ARGS}") if (TEST_LIBRARY_DIRECTORY) if (WIN32) set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}") + elseif (APPLE) + set (ENV{DYLD_LIBRARY_PATH} "$ENV{DYLD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") else () set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}") endif () -- cgit v0.12