diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-05-25 18:26:28 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-25 18:26:28 (GMT) |
| commit | 90293ccec3bf58b6152606138410e80d46604e5d (patch) | |
| tree | b4bc913b1d16af09bc5c436f70bdc526aeb13beb /config | |
| parent | 1e52bc27ee2b491921ca1eb66790094eaaeb6dea (diff) | |
| download | hdf5-90293ccec3bf58b6152606138410e80d46604e5d.zip hdf5-90293ccec3bf58b6152606138410e80d46604e5d.tar.gz hdf5-90293ccec3bf58b6152606138410e80d46604e5d.tar.bz2 | |
Fix multiConfig variable usage and remove unused CMake vars (#3013)
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/HDFMacros.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/LIBAEC/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | config/cmake/ZLIB/CMakeLists.txt | 10 |
3 files changed, 1 insertions, 21 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index be9ceaf..f0b6f03 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 "$<CONFIG>") 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 #----------------------------------------------------------------------------- |