From 90293ccec3bf58b6152606138410e80d46604e5d Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Thu, 25 May 2023 13:26:28 -0500
Subject: Fix multiConfig variable usage and remove unused CMake vars (#3013)

---
 CMakeLists.txt                     | 10 ----------
 config/cmake/HDFMacros.cmake       |  2 +-
 config/cmake/LIBAEC/CMakeLists.txt | 10 ----------
 config/cmake/ZLIB/CMakeLists.txt   | 10 ----------
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 530b153..d3e58c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -596,16 +596,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/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
 #-----------------------------------------------------------------------------
-- 
cgit v0.12