Tests/CXXModules: use a less generic name for the config

Tests/RunCMake/CXXModules/NinjaDependInfoBMIInstall-check.cmake

@@ -2,19 +2,19 @@ include("${CMAKE_CURRENT_LIST_DIR}/check-json.cmake")
 
 if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
   set(have_file 0)
-  foreach (config IN ITEMS Release Debug RelWithDebInfo MinSizeRel)
-    if (NOT EXISTS "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-bmi-install-public.dir/${config}/CXXDependInfo.json")
+  foreach (CXXModules_config IN ITEMS Release Debug RelWithDebInfo MinSizeRel)
+    if (NOT EXISTS "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-bmi-install-public.dir/${CXXModules_config}/CXXDependInfo.json")
       continue ()
     endif ()
     set(have_file 1)
 
-    set(CMAKE_BUILD_TYPE "${config}")
+    set(CMAKE_BUILD_TYPE "${CXXModules_config}")
 
-    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-bmi-install-public.dir/${config}/CXXDependInfo.json" actual_contents)
+    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-bmi-install-public.dir/${CXXModules_config}/CXXDependInfo.json" actual_contents)
     file(READ "${CMAKE_CURRENT_LIST_DIR}/expect/NinjaDependInfoBMIInstall-public.json" expect_contents)
     check_json("${actual_contents}" "${expect_contents}")
 
-    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-bmi-install-private.dir/${config}/CXXDependInfo.json" actual_contents)
+    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-bmi-install-private.dir/${CXXModules_config}/CXXDependInfo.json" actual_contents)
     file(READ "${CMAKE_CURRENT_LIST_DIR}/expect/NinjaDependInfoBMIInstall-private.json" expect_contents)
     check_json("${actual_contents}" "${expect_contents}")
   endforeach ()

Tests/RunCMake/CXXModules/NinjaDependInfoExport-check.cmake

@@ -2,19 +2,19 @@ include("${CMAKE_CURRENT_LIST_DIR}/check-json.cmake")
 
 if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
   set(have_file 0)
-  foreach (config IN ITEMS Release Debug RelWithDebInfo MinSizeRel)
-    if (NOT EXISTS "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-exports-public.dir/${config}/CXXDependInfo.json")
+  foreach (CXXModules_config IN ITEMS Release Debug RelWithDebInfo MinSizeRel)
+    if (NOT EXISTS "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-exports-public.dir/${CXXModules_config}/CXXDependInfo.json")
       continue ()
     endif ()
     set(have_file 1)
 
-    set(CMAKE_BUILD_TYPE "${config}")
+    set(CMAKE_BUILD_TYPE "${CXXModules_config}")
 
-    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-exports-public.dir/${config}/CXXDependInfo.json" actual_contents)
+    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-exports-public.dir/${CXXModules_config}/CXXDependInfo.json" actual_contents)
     file(READ "${CMAKE_CURRENT_LIST_DIR}/expect/NinjaDependInfoExport-public.json" expect_contents)
     check_json("${actual_contents}" "${expect_contents}")
 
-    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-exports-private.dir/${config}/CXXDependInfo.json" actual_contents)
+    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-exports-private.dir/${CXXModules_config}/CXXDependInfo.json" actual_contents)
     file(READ "${CMAKE_CURRENT_LIST_DIR}/expect/NinjaDependInfoExport-private.json" expect_contents)
     check_json("${actual_contents}" "${expect_contents}")
   endforeach ()

Tests/RunCMake/CXXModules/NinjaDependInfoFileSet-check.cmake

@@ -2,19 +2,19 @@ include("${CMAKE_CURRENT_LIST_DIR}/check-json.cmake")
 
 if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
   set(have_file 0)
-  foreach (config IN ITEMS Release Debug RelWithDebInfo MinSizeRel)
-    if (NOT EXISTS "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-file-sets-public.dir/${config}/CXXDependInfo.json")
+  foreach (CXXModules_config IN ITEMS Release Debug RelWithDebInfo MinSizeRel)
+    if (NOT EXISTS "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-file-sets-public.dir/${CXXModules_config}/CXXDependInfo.json")
       continue ()
     endif ()
     set(have_file 1)
 
-    set(CMAKE_BUILD_TYPE "${config}")
+    set(CMAKE_BUILD_TYPE "${CXXModules_config}")
 
-    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-file-sets-public.dir/${config}/CXXDependInfo.json" actual_contents)
+    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-file-sets-public.dir/${CXXModules_config}/CXXDependInfo.json" actual_contents)
     file(READ "${CMAKE_CURRENT_LIST_DIR}/expect/NinjaDependInfoFileSet-public.json" expect_contents)
     check_json("${actual_contents}" "${expect_contents}")
 
-    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-file-sets-private.dir/${config}/CXXDependInfo.json" actual_contents)
+    file(READ "${RunCMake_TEST_BINARY_DIR}/CMakeFiles/ninja-file-sets-private.dir/${CXXModules_config}/CXXDependInfo.json" actual_contents)
     file(READ "${CMAKE_CURRENT_LIST_DIR}/expect/NinjaDependInfoFileSet-private.json" expect_contents)
     check_json("${actual_contents}" "${expect_contents}")
   endforeach ()

Tests/RunCMake/CXXModules/check-json.cmake

@@ -2,14 +2,14 @@ cmake_policy(PUSH)
 cmake_policy(SET CMP0057 NEW)
 
 function (json_placeholders in out)
-  string(REPLACE "<CONFIG>" "${CMAKE_BUILD_TYPE}" in "${in}")
+  string(REPLACE "<CONFIG>" "${CXXModules_config}" in "${in}")
   if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-    string(REPLACE "<CONFIG_DIR>" "${CMAKE_BUILD_TYPE}/" in "${in}")
+    string(REPLACE "<CONFIG_DIR>" "/${CXXModules_config}" in "${in}")
   else ()
     string(REPLACE "<CONFIG_DIR>" "" in "${in}")
   endif ()
   if (CMAKE_BUILD_TYPE)
-    string(REPLACE "<CONFIG_FORCE>" "${CMAKE_BUILD_TYPE}" in "${in}")
+    string(REPLACE "<CONFIG_FORCE>" "${CXXModules_config}" in "${in}")
   else ()
     string(REPLACE "<CONFIG_FORCE>" "noconfig" in "${in}")
   endif ()