diff --git a/Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake b/Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake index b9e41a5af1..cd5c1b76c9 100644 --- a/Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake +++ b/Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake @@ -84,7 +84,7 @@ function (run_cxx_module_test directory) else () set(RunCMake_TEST_OPTIONS -DCMAKE_BUILD_TYPE=Debug) endif () - if (directory MATCHES "import-std") + if (directory MATCHES "imp-std") list(APPEND RunCMake_TEST_OPTIONS ${stdlib_custom_json}) endif () @@ -168,44 +168,44 @@ if ("named" IN_LIST CMake_TEST_MODULE_COMPILATION) run_cxx_module_test(non-trivial-collation-order-randomized) run_cxx_module_test(duplicate) set(RunCMake_CXXModules_NO_TEST 1) - run_cxx_module_test(import-from-object) + run_cxx_module_test(imp-from-object) run_cxx_module_test(circular) run_cxx_module_test(try-compile) run_cxx_module_test(try-run) unset(RunCMake_CXXModules_NO_TEST) run_cxx_module_test(same-src-name) - run_cxx_module_test(scan_properties) + run_cxx_module_test(scan_props) run_cxx_module_test(target-objects) if ("cxx_std_23" IN_LIST CMAKE_CXX_COMPILE_FEATURES AND "import_std23" IN_LIST CMake_TEST_MODULE_COMPILATION) - run_cxx_module_test(import-std) + run_cxx_module_test(imp-std) set(RunCMake_CXXModules_NO_TEST 1) - run_cxx_module_test(import-std-no-std-property) + run_cxx_module_test(imp-std-no-std-prop) unset(RunCMake_CXXModules_NO_TEST) - run_cxx_module_test(import-std-export-no-std-build) + run_cxx_module_test(imp-std-exp-no-std-build) set(RunCMake_CXXModules_INSTALL 1) - run_cxx_module_test(import-std-export-no-std-install) + run_cxx_module_test(imp-std-exp-no-std-install) unset(RunCMake_CXXModules_INSTALL) if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION) - run_cxx_module_test(import-std-not-in-export-build) - run_cxx_module_test(import-std-transitive import-std-transitive-not-in-export-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/import-std-not-in-export-build-build") + run_cxx_module_test(imp-std-not-in-exp-build) + run_cxx_module_test(imp-std-trans imp-std-trans-not-in-exp-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/imp-std-not-in-exp-build-build") set(RunCMake_CXXModules_INSTALL 1) - run_cxx_module_test(import-std-not-in-export-install) + run_cxx_module_test(imp-std-not-in-exp-install) unset(RunCMake_CXXModules_INSTALL) - run_cxx_module_test(import-std-transitive import-std-transitive-not-in-export-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/import-std-not-in-export-install-install") + run_cxx_module_test(imp-std-trans imp-std-trans-not-in-exp-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/imp-std-not-in-exp-install-install") - run_cxx_module_test(import-std-transitive import-std-transitive-export-no-std-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/import-std-export-no-std-build-build" -DEXPORT_NO_STD=1) - run_cxx_module_test(import-std-transitive import-std-transitive-export-no-std-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/import-std-export-no-std-install-install" -DEXPORT_NO_STD=1) + run_cxx_module_test(imp-std-trans imp-std-trans-exp-no-std-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/imp-std-exp-no-std-build-build" -DEXPORT_NO_STD=1) + run_cxx_module_test(imp-std-trans imp-std-trans-exp-no-std-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/imp-std-exp-no-std-install-install" -DEXPORT_NO_STD=1) endif () endif () endif () # Tests which require compile commands support. if ("compile_commands" IN_LIST CMake_TEST_MODULE_COMPILATION) - run_cxx_module_test(export-compile-commands) + run_cxx_module_test(exp-compile-commands) endif () macro (setup_export_build_database_targets) @@ -228,7 +228,7 @@ if ("build_database" IN_LIST CMake_TEST_MODULE_COMPILATION) setup_export_build_database_targets() set(RunCMake_CXXModules_NO_TEST 1) - run_cxx_module_test(export-build-database) + run_cxx_module_test(exp-builddb) unset(RunCMake_CXXModules_NO_TEST) unset(RunCMake_CXXModules_TARGETS) @@ -237,12 +237,12 @@ endif () # Tests which require collation work. if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION) run_cxx_module_test(duplicate-sources) - run_cxx_module_test(public-req-private) + run_cxx_module_test(public-req-priv) set(RunCMake_CXXModules_NO_TEST 1) - run_cxx_module_test(req-private-other-target) + run_cxx_module_test(req-priv-other-target) unset(RunCMake_CXXModules_NO_TEST) run_cxx_module_test_rebuild(depchain-modmap) - run_cxx_module_test_rebuild(depchain-modules-json-file) + run_cxx_module_test_rebuild(depchain-mods-json-file) if (RunCMake_GENERATOR MATCHES "Ninja") run_cxx_module_test_rebuild(depchain-collation-restat) endif () @@ -271,38 +271,38 @@ function (run_cxx_module_import_test type name) list(APPEND ARGN -DCMAKE_EXPORT_BUILD_DATABASE=1) endif () - run_cxx_module_test(import-modules "import-modules-${name}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/${name}-${type}" ${ARGN}) + run_cxx_module_test(imp-mods "imp-mods-${name}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/${name}-${type}" ${ARGN}) endfunction () # Tests which install BMIs if ("export_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION) - run_cxx_module_test(export-interface-no-properties-build) - run_cxx_module_test(export-interface-build) - run_cxx_module_test(export-include-directories-build) - run_cxx_module_test(export-include-directories-old-cmake-build) - run_cxx_module_test(export-usage-build) - run_cxx_module_test(export-bmi-and-interface-build) - run_cxx_module_test(export-command-sepdir-build) - run_cxx_module_test(export-transitive-targets-build) - run_cxx_module_test(export-transitive-modules1-build) - run_cxx_module_test(export-transitive-modules-build export-transitive-modules-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/export-transitive-modules1-build-build" ) - run_cxx_module_test(export-with-headers-build) + run_cxx_module_test(exp-iface-no-props-build) + run_cxx_module_test(exp-iface-build) + run_cxx_module_test(exp-incdirs-build) + run_cxx_module_test(exp-incdirs-old-cmake-build) + run_cxx_module_test(exp-usage-build) + run_cxx_module_test(exp-bmi-and-iface-build) + run_cxx_module_test(exp-command-sepdir-build) + run_cxx_module_test(exp-trans-targets-build) + run_cxx_module_test(exp-trans-mods1-build) + run_cxx_module_test(exp-trans-mods-build exp-trans-mods-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/exp-trans-mods1-build-build" ) + run_cxx_module_test(exp-with-headers-build) if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION AND "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION) - run_cxx_module_import_test(build export-interface-build) - run_cxx_module_import_test(build export-interface-no-properties-build -DNO_PROPERTIES=1) - run_cxx_module_import_test(build export-include-directories-build -DINCLUDE_PROPERTIES=1) - run_cxx_module_import_test(build export-bmi-and-interface-build -DWITH_BMIS=1) - run_cxx_module_import_test(build export-command-sepdir-build -DEXPORT_COMMAND_SEPDIR=1) - run_cxx_module_import_test(build export-transitive-targets-build -DTRANSITIVE_TARGETS=1) - run_cxx_module_import_test(build export-transitive-modules-build -DTRANSITIVE_MODULES=1) - run_cxx_module_import_test(build export-with-headers-build -DWITH_HEADERS=1) + run_cxx_module_import_test(build exp-iface-build) + run_cxx_module_import_test(build exp-iface-no-props-build -DNO_PROPERTIES=1) + run_cxx_module_import_test(build exp-incdirs-build -DINCLUDE_PROPERTIES=1) + run_cxx_module_import_test(build exp-bmi-and-iface-build -DWITH_BMIS=1) + run_cxx_module_import_test(build exp-command-sepdir-build -DEXPORT_COMMAND_SEPDIR=1) + run_cxx_module_import_test(build exp-trans-targets-build -DTRANSITIVE_TARGETS=1) + run_cxx_module_import_test(build exp-trans-mods-build -DTRANSITIVE_MODULES=1) + run_cxx_module_import_test(build exp-with-headers-build -DWITH_HEADERS=1) if ("build_database" IN_LIST CMake_TEST_MODULE_COMPILATION) setup_export_build_database_targets() - run_cxx_module_import_test(build export-build-database -DBUILD_DATABASE=1 EXPORT_BUILD_DATABASE) + run_cxx_module_import_test(build exp-builddb -DBUILD_DATABASE=1 EXPORT_BUILD_DATABASE) unset(RunCMake_CXXModules_TARGETS) endif () @@ -315,31 +315,31 @@ set(RunCMake_CXXModules_INSTALL 1) # Tests which install BMIs if ("install_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION) run_cxx_module_test(install-bmi) - run_cxx_module_test(install-bmi-and-interfaces) + run_cxx_module_test(install-bmi-and-ifaces) if ("export_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION) - run_cxx_module_test(export-interface-no-properties-install) - run_cxx_module_test(export-interface-install) - run_cxx_module_test(export-include-directories-install) - run_cxx_module_test(export-include-directories-old-cmake-install) - run_cxx_module_test(export-usage-install) - run_cxx_module_test(export-bmi-and-interface-install) - run_cxx_module_test(export-command-sepdir-install) - run_cxx_module_test(export-transitive-targets-install) - run_cxx_module_test(export-transitive-modules1-install) - run_cxx_module_test(export-transitive-modules-install export-transitive-modules-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/export-transitive-modules1-install-install" ) - run_cxx_module_test(export-with-headers-install) + run_cxx_module_test(exp-iface-no-props-install) + run_cxx_module_test(exp-iface-install) + run_cxx_module_test(exp-incdirs-install) + run_cxx_module_test(exp-incdirs-old-cmake-install) + run_cxx_module_test(exp-usage-install) + run_cxx_module_test(exp-bmi-and-iface-install) + run_cxx_module_test(exp-command-sepdir-install) + run_cxx_module_test(exp-trans-targets-install) + run_cxx_module_test(exp-trans-mods1-install) + run_cxx_module_test(exp-trans-mods-install exp-trans-mods-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/exp-trans-mods1-install-install" ) + run_cxx_module_test(exp-with-headers-install) if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION AND "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION) - run_cxx_module_import_test(install export-interface-install) - run_cxx_module_import_test(install export-interface-no-properties-install -DNO_PROPERTIES=1) - run_cxx_module_import_test(install export-include-directories-install -DINCLUDE_PROPERTIES=1) - run_cxx_module_import_test(install export-bmi-and-interface-install -DWITH_BMIS=1) - run_cxx_module_import_test(install export-command-sepdir-install -DEXPORT_COMMAND_SEPDIR=1) - run_cxx_module_import_test(install export-transitive-targets-install -DTRANSITIVE_TARGETS=1) - run_cxx_module_import_test(install export-transitive-modules-install -DTRANSITIVE_MODULES=1) - run_cxx_module_import_test(install export-with-headers-install -DWITH_HEADERS=1) + run_cxx_module_import_test(install exp-iface-install) + run_cxx_module_import_test(install exp-iface-no-props-install -DNO_PROPERTIES=1) + run_cxx_module_import_test(install exp-incdirs-install -DINCLUDE_PROPERTIES=1) + run_cxx_module_import_test(install exp-bmi-and-iface-install -DWITH_BMIS=1) + run_cxx_module_import_test(install exp-command-sepdir-install -DEXPORT_COMMAND_SEPDIR=1) + run_cxx_module_import_test(install exp-trans-targets-install -DTRANSITIVE_TARGETS=1) + run_cxx_module_import_test(install exp-trans-mods-install -DTRANSITIVE_MODULES=1) + run_cxx_module_import_test(install exp-with-headers-install -DWITH_HEADERS=1) endif () endif () endif () @@ -367,6 +367,6 @@ endfunction () # Installation happens within `run_cxx_module_test_ninja`. set(RunCMake_CXXModules_INSTALL 0) -set(test_set modules-from-ninja) -run_cxx_module_test_ninja("export-${test_set}") -run_cxx_module_test(import-modules "import-${test_set}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/export-${test_set}-ninja-install" -DFROM_NINJA=1) +set(test_set mods-from-ninja) +run_cxx_module_test_ninja("exp-${test_set}") +run_cxx_module_test(imp-mods "imp-${test_set}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/exp-${test_set}-ninja-install" -DFROM_NINJA=1) diff --git a/Tests/RunCMake/CXXModulesCompile/examples/cxx-modules-find-bmi-and-interfaces.cmake b/Tests/RunCMake/CXXModulesCompile/examples/cxx-mods-find-bmi-and-ifaces.cmake similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/cxx-modules-find-bmi-and-interfaces.cmake rename to Tests/RunCMake/CXXModulesCompile/examples/cxx-mods-find-bmi-and-ifaces.cmake diff --git a/Tests/RunCMake/CXXModulesCompile/examples/depchain-modules-json-file-rebuild-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/depchain-mods-json-file-rebuild-check.cmake similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/depchain-modules-json-file-rebuild-check.cmake rename to Tests/RunCMake/CXXModulesCompile/examples/depchain-mods-json-file-rebuild-check.cmake diff --git a/Tests/RunCMake/CXXModulesCompile/examples/depchain-modules-json-file/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/depchain-mods-json-file/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/depchain-modules-json-file/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/depchain-mods-json-file/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/depchain-modules-json-file/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/depchain-mods-json-file/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/depchain-modules-json-file/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/depchain-mods-json-file/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/depchain-modules-json-file/main.cxx b/Tests/RunCMake/CXXModulesCompile/examples/depchain-mods-json-file/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/depchain-modules-json-file/main.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/depchain-mods-json-file/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/depchain-modules-json-file/pre-rebuild.cmake b/Tests/RunCMake/CXXModulesCompile/examples/depchain-mods-json-file/pre-rebuild.cmake similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/depchain-modules-json-file/pre-rebuild.cmake rename to Tests/RunCMake/CXXModulesCompile/examples/depchain-mods-json-file/pre-rebuild.cmake diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/no_modules.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/no_modules.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/no_modules.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/no_modules.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/no_modules.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/no_modules.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-bmi-and-interface-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-bmi-and-iface-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-build-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-build-check.cmake new file mode 100644 index 0000000000..303842fb5c --- /dev/null +++ b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-build-check.cmake @@ -0,0 +1,19 @@ +include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake") + +check_build_database("exp-builddb" "build_database.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_CXX.json" NO_EXIST) + +check_build_database("exp-builddb" "build_database_CXX_Debug.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_Debug.json" NO_EXIST) + +if (RunCMake_GENERATOR_IS_MULTI_CONFIG) + check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) + + # check_build_database("exp-builddb" "build_database_CXX_Release.json" NO_EXIST) + # check_build_database("exp-builddb" "build_database_Release.json" NO_EXIST) + # check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" NO_EXIST) +else () + check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/CXX_build_database.json" JUST_TARGET) +endif () + +string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-check.cmake similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database-check.cmake rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-check.cmake diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-stderr.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-stderr.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database-stderr.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-stderr.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database-check.cmake new file mode 100644 index 0000000000..9c16a2f3d7 --- /dev/null +++ b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database-check.cmake @@ -0,0 +1,21 @@ +include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake") + +if (RunCMake_GENERATOR_IS_MULTI_CONFIG) + check_build_database("exp-builddb" "build_database.json" ALL_MULTI) + check_build_database("exp-builddb" "build_database_CXX.json" JUST_CXX_MULTI) + + check_build_database("exp-builddb" "build_database_CXX_Debug.json" CXX_AND_DEBUG) + check_build_database("exp-builddb" "build_database_Debug.json" JUST_DEBUG) + check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) + + check_build_database("exp-builddb" "build_database_CXX_Release.json" CXX_AND_RELEASE) + check_build_database("exp-builddb" "build_database_Release.json" JUST_RELEASE) + check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) +else () + check_build_database("exp-builddb" "build_database.json" ALL) + check_build_database("exp-builddb" "build_database_CXX.json" JUST_CXX) + + check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/CXX_build_database.json" JUST_TARGET) +endif () + +string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database/CXX-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database/CXX-check.cmake similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database/CXX-check.cmake rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database/CXX-check.cmake diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database/CXX/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database/CXX/Debug-check.cmake rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database/CXX/Release-Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database/CXX/Release-Release-check.cmake rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database/Debug-check.cmake similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database/Debug-check.cmake rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database/Debug-check.cmake diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database/Release-Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database/Release-Release-check.cmake similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database/Release-Release-check.cmake rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb-target-cmake_build_database/Release-Release-check.cmake diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database/dep_interface_include/anchor b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/dep_interface_include/anchor similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database/dep_interface_include/anchor rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/dep_interface_include/anchor diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database/lib.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/lib.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database/lib.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/lib.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database/target_interface_include/anchor b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/target_interface_include/anchor similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database/target_interface_include/anchor rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/target_interface_include/anchor diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database/target_public_include/anchor b/Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/target_public_include/anchor similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-build-database/target_public_include/anchor rename to Tests/RunCMake/CXXModulesCompile/examples/exp-builddb/target_public_include/anchor diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-build/subdir/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-build/subdir/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-build/subdir/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-build/subdir/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-build/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-build/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-build/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-install/subdir/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-install/subdir/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-install/subdir/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-install/subdir/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-install/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-install/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-install/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-command-sepdir-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-command-sepdir-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-compile-commands-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/exp-compile-commands-check.cmake similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-compile-commands-check.cmake rename to Tests/RunCMake/CXXModulesCompile/examples/exp-compile-commands-check.cmake diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-compile-commands/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-compile-commands/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-compile-commands/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-compile-commands/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-compile-commands/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-compile-commands/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-compile-commands/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-compile-commands/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-compile-commands/main.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-compile-commands/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-compile-commands/main.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-compile-commands/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/no_modules.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/no_modules.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/no_modules.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/no_modules.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/no_modules.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/no_modules.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/no_modules.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/no_modules.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/no_modules.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-build/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/no_modules.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/no_modules.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/no_modules.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-install/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-iface-no-props-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/include/include.h b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/include/include.h similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/include/include.h rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/include/include.h diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/includes/includes.h b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/includes/includes.h similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/includes/includes.h rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/includes/includes.h diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/no_modules.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/no_modules.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/no_modules.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-build/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/include/include.h b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/include/include.h similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/include/include.h rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/include/include.h diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/includes/includes.h b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/includes/includes.h similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/includes/includes.h rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/includes/includes.h diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/no_modules.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/no_modules.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/no_modules.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-interface-no-properties-install/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-build/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-build/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-build/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-install/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-install/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-install/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-include-directories-old-cmake-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-incdirs-old-cmake-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/no_modules.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/no_modules.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/no_modules.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-modules-from-ninja/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-mods-from-ninja/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-build/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-build/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-build/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-install/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-install/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-install/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-build/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-build/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-build/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-install/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-install/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-install/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-modules1-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-mods1-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/include/include.h b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/include/include.h similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/include/include.h rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/include/include.h diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/includes/includes.h b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/includes/includes.h similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/includes/includes.h rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/includes/includes.h diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/no_modules.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/no_modules.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/no_modules.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/include/include.h b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/include/include.h similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/include/include.h rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/include/include.h diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/includes/includes.h b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/includes/includes.h similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/includes/includes.h rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/includes/includes.h diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/no_modules.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/no_modules.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/no_modules.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/subdir/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/subdir/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/subdir/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-transitive-targets-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-trans-targets-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-usage-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-usage-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-usage-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-usage-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-usage-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-usage-build/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-usage-build/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-usage-build/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-usage-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-usage-build/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-usage-build/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-usage-build/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-usage-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-usage-build/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-usage-build/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-usage-build/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-usage-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-usage-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-usage-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-usage-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-usage-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-usage-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-usage-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-usage-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-usage-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-usage-install/forward.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-usage-install/forward.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-usage-install/forward.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-usage-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-usage-install/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-usage-install/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-usage-install/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-usage-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-usage-install/private.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-usage-install/private.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-usage-install/private.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-usage-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-usage-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-usage-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-usage-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-build/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-build/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-build/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-build/include/subdir/header.h b/Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-build/include/subdir/header.h similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-build/include/subdir/header.h rename to Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-build/include/subdir/header.h diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-install/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-install/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-install/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-install/include/subdir/header.h b/Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-install/include/subdir/header.h similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-install/include/subdir/header.h rename to Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-install/include/subdir/header.h diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/export-with-headers-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/exp-with-headers-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-all-multi.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-all-multi.json similarity index 65% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-all-multi.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-all-multi.json index ffb74cbb03..59129d6d79 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-all-multi.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-all-multi.json @@ -14,10 +14,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -29,7 +29,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/lib.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/lib.cxx", "-c", - "PATH:/examples/export-build-database/lib.cxx" + "PATH:/examples/exp-builddb/lib.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -37,10 +37,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -56,10 +56,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -73,7 +73,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/export-build-database/lib.cxx", + "source": "PATH:/examples/exp-builddb/lib.cxx", "work-directory": "" }, { @@ -84,10 +84,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -101,7 +101,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/importable.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/importable.cxx", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -109,10 +109,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -128,10 +128,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -149,7 +149,7 @@ "importable": "PATH:/CMakeFiles/export_build_database.dir/importable" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], @@ -167,10 +167,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -182,7 +182,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/lib.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/lib.cxx", "-c", - "PATH:/examples/export-build-database/lib.cxx" + "PATH:/examples/exp-builddb/lib.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -190,10 +190,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -209,10 +209,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -226,7 +226,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/export-build-database/lib.cxx", + "source": "PATH:/examples/exp-builddb/lib.cxx", "work-directory": "" }, { @@ -237,10 +237,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -254,7 +254,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/importable.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/importable.cxx", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -262,10 +262,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -281,10 +281,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -302,7 +302,7 @@ "importable": "/CMakeFiles/export_build_database.dir/importable" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-target.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-all.json similarity index 65% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-target.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-all.json index 4412d35b10..3b3544c91f 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-target.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-all.json @@ -14,10 +14,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -29,7 +29,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/lib.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/lib.cxx", "-c", - "PATH:/examples/export-build-database/lib.cxx" + "PATH:/examples/exp-builddb/lib.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -37,10 +37,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -56,10 +56,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -73,7 +73,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/export-build-database/lib.cxx", + "source": "PATH:/examples/exp-builddb/lib.cxx", "work-directory": "" }, { @@ -84,10 +84,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -101,7 +101,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/importable.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/importable.cxx", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -109,10 +109,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -128,10 +128,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -149,7 +149,7 @@ "importable": "/CMakeFiles/export_build_database.dir/importable" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-cxx.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-config.json similarity index 65% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-cxx.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-config.json index 3815df5412..f209d29e16 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-cxx.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-config.json @@ -14,10 +14,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -29,7 +29,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/lib.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/lib.cxx", "-c", - "PATH:/examples/export-build-database/lib.cxx" + "PATH:/examples/exp-builddb/lib.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -37,10 +37,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -56,10 +56,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -73,7 +73,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/export-build-database/lib.cxx", + "source": "PATH:/examples/exp-builddb/lib.cxx", "work-directory": "" }, { @@ -84,10 +84,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -101,7 +101,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/importable.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/importable.cxx", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -109,10 +109,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -128,10 +128,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -149,7 +149,7 @@ "importable": "PATH:/CMakeFiles/export_build_database.dir/importable" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-config.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-cxx-config.json similarity index 65% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-config.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-cxx-config.json index 3815df5412..f209d29e16 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-config.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-cxx-config.json @@ -14,10 +14,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -29,7 +29,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/lib.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/lib.cxx", "-c", - "PATH:/examples/export-build-database/lib.cxx" + "PATH:/examples/exp-builddb/lib.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -37,10 +37,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -56,10 +56,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -73,7 +73,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/export-build-database/lib.cxx", + "source": "PATH:/examples/exp-builddb/lib.cxx", "work-directory": "" }, { @@ -84,10 +84,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -101,7 +101,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/importable.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/importable.cxx", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -109,10 +109,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -128,10 +128,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -149,7 +149,7 @@ "importable": "PATH:/CMakeFiles/export_build_database.dir/importable" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-cxx-multi.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-cxx-multi.json similarity index 65% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-cxx-multi.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-cxx-multi.json index 5d2fa078f7..eb3c07e4da 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-cxx-multi.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-cxx-multi.json @@ -14,10 +14,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -29,7 +29,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/lib.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/lib.cxx", "-c", - "PATH:/examples/export-build-database/lib.cxx" + "PATH:/examples/exp-builddb/lib.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -37,10 +37,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -56,10 +56,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -73,7 +73,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/export-build-database/lib.cxx", + "source": "PATH:/examples/exp-builddb/lib.cxx", "work-directory": "" }, { @@ -84,10 +84,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -101,7 +101,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/importable.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/importable.cxx", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -109,10 +109,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -128,10 +128,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -149,7 +149,7 @@ "importable": "PATH:/CMakeFiles/export_build_database.dir/importable" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], @@ -167,10 +167,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -182,7 +182,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/lib.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/lib.cxx", "-c", - "PATH:/examples/export-build-database/lib.cxx" + "PATH:/examples/exp-builddb/lib.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -190,10 +190,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -209,10 +209,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -226,7 +226,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/export-build-database/lib.cxx", + "source": "PATH:/examples/exp-builddb/lib.cxx", "work-directory": "" }, { @@ -237,10 +237,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -254,7 +254,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/importable.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/importable.cxx", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -262,10 +262,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -281,10 +281,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -302,7 +302,7 @@ "importable": "PATH:/CMakeFiles/export_build_database.dir/importable" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-cxx-config.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-cxx.json similarity index 65% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-cxx-config.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-cxx.json index 3815df5412..f209d29e16 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-cxx-config.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-cxx.json @@ -14,10 +14,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -29,7 +29,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/lib.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/lib.cxx", "-c", - "PATH:/examples/export-build-database/lib.cxx" + "PATH:/examples/exp-builddb/lib.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -37,10 +37,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -56,10 +56,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -73,7 +73,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/export-build-database/lib.cxx", + "source": "PATH:/examples/exp-builddb/lib.cxx", "work-directory": "" }, { @@ -84,10 +84,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -101,7 +101,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/importable.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/importable.cxx", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -109,10 +109,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -128,10 +128,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -149,7 +149,7 @@ "importable": "PATH:/CMakeFiles/export_build_database.dir/importable" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-all-multi.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-all-multi.json similarity index 66% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-all-multi.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-all-multi.json index de16f8e2e6..7617a22451 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-all-multi.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-all-multi.json @@ -12,8 +12,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -22,14 +22,14 @@ "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir/use.cxx.d\"", "PATH:CMakeFiles/use_import_interfaces.dir/use.cxx", "-c", - "PATH:/examples/import-modules/use.cxx" + "PATH:/examples/imp-mods/use.cxx" ], "baseline-arguments": [ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -40,8 +40,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -52,7 +52,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/import-modules/use.cxx", + "source": "PATH:/examples/imp-mods/use.cxx", "work-directory": "" } ], @@ -68,8 +68,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -78,14 +78,14 @@ "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir/use.cxx.d\"", "PATH:CMakeFiles/use_import_interfaces.dir/use.cxx", "-c", - "PATH:/examples/import-modules/use.cxx" + "PATH:/examples/imp-mods/use.cxx" ], "baseline-arguments": [ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -96,8 +96,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -108,7 +108,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/import-modules/use.cxx", + "source": "PATH:/examples/imp-mods/use.cxx", "work-directory": "" } ], @@ -127,11 +127,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -144,7 +144,7 @@ "REGEX:", "REGEX:PATH:CMakeFiles/CXXModules__export_build_database@synth_.dir/", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -153,11 +153,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -174,11 +174,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -194,7 +194,7 @@ "importable": "" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], @@ -213,11 +213,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -230,7 +230,7 @@ "REGEX:", "REGEX:PATH:CMakeFiles/CXXModules__export_build_database@synth_.dir/", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -239,11 +239,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -260,11 +260,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -280,7 +280,7 @@ "importable": "" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-all.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-all.json similarity index 66% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-all.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-all.json index 0e510b8094..35e72b74e2 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-all.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-all.json @@ -12,8 +12,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -22,14 +22,14 @@ "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir/use.cxx.d\"", "PATH:CMakeFiles/use_import_interfaces.dir/use.cxx", "-c", - "PATH:/examples/import-modules/use.cxx" + "PATH:/examples/imp-mods/use.cxx" ], "baseline-arguments": [ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -40,8 +40,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -52,7 +52,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/import-modules/use.cxx", + "source": "PATH:/examples/imp-mods/use.cxx", "work-directory": "" } ], @@ -71,11 +71,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -88,7 +88,7 @@ "REGEX:", "REGEX:PATH:CMakeFiles/CXXModules__export_build_database@synth_.dir/", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -97,11 +97,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -118,11 +118,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -138,7 +138,7 @@ "importable": "" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-cxx.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-config.json similarity index 66% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-cxx.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-config.json index 0e510b8094..35e72b74e2 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-cxx.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-config.json @@ -12,8 +12,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -22,14 +22,14 @@ "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir/use.cxx.d\"", "PATH:CMakeFiles/use_import_interfaces.dir/use.cxx", "-c", - "PATH:/examples/import-modules/use.cxx" + "PATH:/examples/imp-mods/use.cxx" ], "baseline-arguments": [ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -40,8 +40,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -52,7 +52,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/import-modules/use.cxx", + "source": "PATH:/examples/imp-mods/use.cxx", "work-directory": "" } ], @@ -71,11 +71,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -88,7 +88,7 @@ "REGEX:", "REGEX:PATH:CMakeFiles/CXXModules__export_build_database@synth_.dir/", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -97,11 +97,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -118,11 +118,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -138,7 +138,7 @@ "importable": "" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-config.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-cxx-config.json similarity index 66% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-config.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-cxx-config.json index 0e510b8094..35e72b74e2 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-config.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-cxx-config.json @@ -12,8 +12,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -22,14 +22,14 @@ "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir/use.cxx.d\"", "PATH:CMakeFiles/use_import_interfaces.dir/use.cxx", "-c", - "PATH:/examples/import-modules/use.cxx" + "PATH:/examples/imp-mods/use.cxx" ], "baseline-arguments": [ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -40,8 +40,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -52,7 +52,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/import-modules/use.cxx", + "source": "PATH:/examples/imp-mods/use.cxx", "work-directory": "" } ], @@ -71,11 +71,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -88,7 +88,7 @@ "REGEX:", "REGEX:PATH:CMakeFiles/CXXModules__export_build_database@synth_.dir/", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -97,11 +97,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -118,11 +118,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -138,7 +138,7 @@ "importable": "" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-cxx-multi.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-cxx-multi.json similarity index 66% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-cxx-multi.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-cxx-multi.json index de16f8e2e6..7617a22451 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-cxx-multi.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-cxx-multi.json @@ -12,8 +12,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -22,14 +22,14 @@ "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir/use.cxx.d\"", "PATH:CMakeFiles/use_import_interfaces.dir/use.cxx", "-c", - "PATH:/examples/import-modules/use.cxx" + "PATH:/examples/imp-mods/use.cxx" ], "baseline-arguments": [ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -40,8 +40,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -52,7 +52,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/import-modules/use.cxx", + "source": "PATH:/examples/imp-mods/use.cxx", "work-directory": "" } ], @@ -68,8 +68,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -78,14 +78,14 @@ "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir/use.cxx.d\"", "PATH:CMakeFiles/use_import_interfaces.dir/use.cxx", "-c", - "PATH:/examples/import-modules/use.cxx" + "PATH:/examples/imp-mods/use.cxx" ], "baseline-arguments": [ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -96,8 +96,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -108,7 +108,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/import-modules/use.cxx", + "source": "PATH:/examples/imp-mods/use.cxx", "work-directory": "" } ], @@ -127,11 +127,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -144,7 +144,7 @@ "REGEX:", "REGEX:PATH:CMakeFiles/CXXModules__export_build_database@synth_.dir/", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -153,11 +153,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -174,11 +174,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -194,7 +194,7 @@ "importable": "" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], @@ -213,11 +213,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -230,7 +230,7 @@ "REGEX:", "REGEX:PATH:CMakeFiles/CXXModules__export_build_database@synth_.dir/", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -239,11 +239,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -260,11 +260,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -280,7 +280,7 @@ "importable": "" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-cxx-config.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-cxx.json similarity index 66% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-cxx-config.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-cxx.json index 0e510b8094..35e72b74e2 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-cxx-config.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-cxx.json @@ -12,8 +12,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -22,14 +22,14 @@ "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir/use.cxx.d\"", "PATH:CMakeFiles/use_import_interfaces.dir/use.cxx", "-c", - "PATH:/examples/import-modules/use.cxx" + "PATH:/examples/imp-mods/use.cxx" ], "baseline-arguments": [ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -40,8 +40,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -52,7 +52,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/import-modules/use.cxx", + "source": "PATH:/examples/imp-mods/use.cxx", "work-directory": "" } ], @@ -71,11 +71,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -88,7 +88,7 @@ "REGEX:", "REGEX:PATH:CMakeFiles/CXXModules__export_build_database@synth_.dir/", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -97,11 +97,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -118,11 +118,11 @@ "-Dtarget_interface_define", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", - "PATH:-I/examples/export-build-database/target_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", + "PATH:-I/examples/exp-builddb/target_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -138,7 +138,7 @@ "importable": "" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-target.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-target.json similarity index 72% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-target.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-target.json index 1435edc414..5986072e23 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-imported-target.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-imped-target.json @@ -12,8 +12,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -22,14 +22,14 @@ "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir/use.cxx.d\"", "PATH:CMakeFiles/use_import_interfaces.dir/use.cxx", "-c", - "PATH:/examples/import-modules/use.cxx" + "PATH:/examples/imp-mods/use.cxx" ], "baseline-arguments": [ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -40,8 +40,8 @@ "-D_MBCS", "-Dtarget_interface_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/target_interface_include", - "PATH:-I/examples/export-build-database/target_public_include", + "PATH:-I/examples/exp-builddb/target_interface_include", + "PATH:-I/examples/exp-builddb/target_public_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -52,7 +52,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/import-modules/use.cxx", + "source": "PATH:/examples/imp-mods/use.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-all.json b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-target.json similarity index 65% rename from Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-all.json rename to Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-target.json index 4412d35b10..3b3544c91f 100644 --- a/Tests/RunCMake/CXXModulesCompile/examples/expect/export-build-database-all.json +++ b/Tests/RunCMake/CXXModulesCompile/examples/expect/exp-builddb-target.json @@ -14,10 +14,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -29,7 +29,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/lib.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/lib.cxx", "-c", - "PATH:/examples/export-build-database/lib.cxx" + "PATH:/examples/exp-builddb/lib.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -37,10 +37,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -56,10 +56,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -73,7 +73,7 @@ "private": true, "provides": {}, "requires": ["importable"], - "source": "PATH:/examples/export-build-database/lib.cxx", + "source": "PATH:/examples/exp-builddb/lib.cxx", "work-directory": "" }, { @@ -84,10 +84,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -101,7 +101,7 @@ "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir/importable.cxx.d\"", "PATH:CMakeFiles/export_build_database.dir/importable.cxx", "-c", - "PATH:/examples/export-build-database/importable.cxx" + "PATH:/examples/exp-builddb/importable.cxx" ], "baseline-arguments": [ "-D_MBCS", @@ -109,10 +109,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -128,10 +128,10 @@ "-Dfrom_compile_definitions", "-Dtarget_private_define", "-Dtarget_public_define", - "PATH:-I/examples/export-build-database/from_include_directories", - "PATH:-I/examples/export-build-database/target_private_include", - "PATH:-I/examples/export-build-database/target_public_include", - "PATH:-I/examples/export-build-database/dep_interface_include", + "PATH:-I/examples/exp-builddb/from_include_directories", + "PATH:-I/examples/exp-builddb/target_private_include", + "PATH:-I/examples/exp-builddb/target_public_include", + "PATH:-I/examples/exp-builddb/dep_interface_include", "-Dfrom_cmake_cxx_flags", "-Dfrom_cmake_cxx__flags", "", @@ -149,7 +149,7 @@ "importable": "/CMakeFiles/export_build_database.dir/importable" }, "requires": [], - "source": "PATH:/examples/export-build-database/importable.cxx", + "source": "PATH:/examples/exp-builddb/importable.cxx", "work-directory": "" } ], diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-build-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-build-check.cmake deleted file mode 100644 index 131926bafc..0000000000 --- a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-build-check.cmake +++ /dev/null @@ -1,19 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake") - -check_build_database("export-build-database" "build_database.json" NO_EXIST) -check_build_database("export-build-database" "build_database_CXX.json" NO_EXIST) - -check_build_database("export-build-database" "build_database_CXX_Debug.json" NO_EXIST) -check_build_database("export-build-database" "build_database_Debug.json" NO_EXIST) - -if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) - - # check_build_database("export-build-database" "build_database_CXX_Release.json" NO_EXIST) - # check_build_database("export-build-database" "build_database_Release.json" NO_EXIST) - # check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" NO_EXIST) -else () - check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/CXX_build_database.json" JUST_TARGET) -endif () - -string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database-check.cmake deleted file mode 100644 index 79db482678..0000000000 --- a/Tests/RunCMake/CXXModulesCompile/examples/export-build-database-target-cmake_build_database-check.cmake +++ /dev/null @@ -1,21 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake") - -if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database" "build_database.json" ALL_MULTI) - check_build_database("export-build-database" "build_database_CXX.json" JUST_CXX_MULTI) - - check_build_database("export-build-database" "build_database_CXX_Debug.json" CXX_AND_DEBUG) - check_build_database("export-build-database" "build_database_Debug.json" JUST_DEBUG) - check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) - - check_build_database("export-build-database" "build_database_CXX_Release.json" CXX_AND_RELEASE) - check_build_database("export-build-database" "build_database_Release.json" JUST_RELEASE) - check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) -else () - check_build_database("export-build-database" "build_database.json" ALL) - check_build_database("export-build-database" "build_database_CXX.json" JUST_CXX) - - check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/CXX_build_database.json" JUST_TARGET) -endif () - -string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-from-object/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-from-object/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-from-object/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-from-object/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-from-object/object-a.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-from-object/object-a.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-from-object/object-a.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-from-object/object-a.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-from-object/object-b.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-from-object/object-b.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-from-object/object-b.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-from-object/object-b.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-build-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-build-check.cmake new file mode 100644 index 0000000000..9612fdb9bb --- /dev/null +++ b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-build-check.cmake @@ -0,0 +1,18 @@ +include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake") +set(item_filter "-ifcOnly") + +check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST) +check_build_database("exp-builddb-imped" "build_database_CXX.json" NO_EXIST) +if (RunCMake_GENERATOR_IS_MULTI_CONFIG) + check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" NO_EXIST) + check_build_database("exp-builddb-imped" "build_database_Debug.json" NO_EXIST) + check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/Debug/CXX_build_database.json" NO_EXIST) + + check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" NO_EXIST) + check_build_database("exp-builddb-imped" "build_database_Release.json" NO_EXIST) + check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/Release/CXX_build_database.json" NO_EXIST) +else () + check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/CXX_build_database.json" NO_EXIST) +endif () + +string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-check.cmake new file mode 100644 index 0000000000..9612fdb9bb --- /dev/null +++ b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-check.cmake @@ -0,0 +1,18 @@ +include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake") +set(item_filter "-ifcOnly") + +check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST) +check_build_database("exp-builddb-imped" "build_database_CXX.json" NO_EXIST) +if (RunCMake_GENERATOR_IS_MULTI_CONFIG) + check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" NO_EXIST) + check_build_database("exp-builddb-imped" "build_database_Debug.json" NO_EXIST) + check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/Debug/CXX_build_database.json" NO_EXIST) + + check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" NO_EXIST) + check_build_database("exp-builddb-imped" "build_database_Release.json" NO_EXIST) + check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/Release/CXX_build_database.json" NO_EXIST) +else () + check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/CXX_build_database.json" NO_EXIST) +endif () + +string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-stderr.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-stderr.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-stderr.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-stderr.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database-check.cmake new file mode 100644 index 0000000000..518c20b90e --- /dev/null +++ b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database-check.cmake @@ -0,0 +1,22 @@ +include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake") +set(item_filter "-ifcOnly") + +if (RunCMake_GENERATOR_IS_MULTI_CONFIG) + check_build_database("exp-builddb-imped" "build_database.json" ALL_MULTI) + check_build_database("exp-builddb-imped" "build_database_CXX.json" JUST_CXX_MULTI) + + check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG) + check_build_database("exp-builddb-imped" "build_database_Debug.json" JUST_DEBUG) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) + + check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" CXX_AND_RELEASE) + check_build_database("exp-builddb-imped" "build_database_Release.json" JUST_RELEASE) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) +else () + check_build_database("exp-builddb-imped" "build_database.json" ALL) + check_build_database("exp-builddb-imped" "build_database_CXX.json" JUST_CXX) + + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) +endif () + +string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/CXX-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/CXX-check.cmake new file mode 100644 index 0000000000..4cfe667ca1 --- /dev/null +++ b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/CXX-check.cmake @@ -0,0 +1,22 @@ +include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake") +set(item_filter "-ifcOnly") + +check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST) + +if (RunCMake_GENERATOR_IS_MULTI_CONFIG) + check_build_database("exp-builddb-imped" "build_database_CXX.json" JUST_CXX_MULTI) + + check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG) + check_build_database("exp-builddb-imped" "build_database_Debug.json" JUST_DEBUG) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) + + check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" CXX_AND_RELEASE) + check_build_database("exp-builddb-imped" "build_database_Release.json" JUST_RELEASE) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) +else () + check_build_database("exp-builddb-imped" "build_database_CXX.json" JUST_CXX) + + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) +endif () + +string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake new file mode 100644 index 0000000000..05e542fa42 --- /dev/null +++ b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake @@ -0,0 +1,19 @@ +include("${CMAKE_CURRENT_LIST_DIR}/../../build-database-check.cmake") +set(item_filter "-ifcOnly") + +check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST) +check_build_database("exp-builddb-imped" "build_database_CXX.json" NO_EXIST) + +if (RunCMake_GENERATOR_IS_MULTI_CONFIG) + check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG) + check_build_database("exp-builddb-imped" "build_database_Debug.json" NO_EXIST) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) + + check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" NO_EXIST) + check_build_database("exp-builddb-imped" "build_database_Release.json" NO_EXIST) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" NO_EXIST) +else () + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) +endif () + +string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake new file mode 100644 index 0000000000..5ff723c833 --- /dev/null +++ b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake @@ -0,0 +1,19 @@ +include("${CMAKE_CURRENT_LIST_DIR}/../../build-database-check.cmake") +set(item_filter "-ifcOnly") + +check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST) +check_build_database("exp-builddb-imped" "build_database_CXX.json" NO_EXIST) + +if (RunCMake_GENERATOR_IS_MULTI_CONFIG) + check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG) + check_build_database("exp-builddb-imped" "build_database_Debug.json" JUST_DEBUG) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) + + check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" CXX_AND_RELEASE) + check_build_database("exp-builddb-imped" "build_database_Release.json" NO_EXIST) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) +else () + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) +endif () + +string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/Debug-check.cmake new file mode 100644 index 0000000000..7a7598e802 --- /dev/null +++ b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/Debug-check.cmake @@ -0,0 +1,19 @@ +include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake") +set(item_filter "-ifcOnly") + +check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST) +check_build_database("exp-builddb-imped" "build_database_CXX.json" NO_EXIST) + +if (RunCMake_GENERATOR_IS_MULTI_CONFIG) + check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG) + check_build_database("exp-builddb-imped" "build_database_Debug.json" JUST_DEBUG) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) + + check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" NO_EXIST) + check_build_database("exp-builddb-imped" "build_database_Release.json" NO_EXIST) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" NO_EXIST) +else () + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) +endif () + +string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/Release-check.cmake new file mode 100644 index 0000000000..1ea6a23422 --- /dev/null +++ b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods-exp-builddb-target-cmake_build_database/Release-check.cmake @@ -0,0 +1,19 @@ +include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake") +set(item_filter "-ifcOnly") + +check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST) +check_build_database("exp-builddb-imped" "build_database_CXX.json" JUST_CXX) + +if (RunCMake_GENERATOR_IS_MULTI_CONFIG) + check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG) + check_build_database("exp-builddb-imped" "build_database_Debug.json" JUST_DEBUG) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) + + check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" CXX_AND_RELEASE) + check_build_database("exp-builddb-imped" "build_database_Release.json" JUST_RELEASE) + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) +else () + check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) +endif () + +string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-modules/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-modules/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-mods/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-modules/use.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-mods/use.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-modules/use.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-mods/use.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build-stderr.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build-stderr.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build-stderr.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build-stderr.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build/impl-uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build/impl-uses-std.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build/impl-uses-std.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build/impl-uses-std.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build/main.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build/main.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build/uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build/uses-std.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-build/uses-std.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-build/uses-std.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install-stderr.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install-stderr.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install-stderr.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install-stderr.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install/impl-uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install/impl-uses-std.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install/impl-uses-std.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install/impl-uses-std.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install/main.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install/main.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install/uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install/uses-std.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-export-no-std-install/uses-std.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-exp-no-std-install/uses-std.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-no-std-property-build-result.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-no-std-prop-build-result.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-no-std-property-build-result.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-no-std-prop-build-result.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-no-std-property-build-stdout.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-no-std-prop-build-stdout.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-no-std-property-build-stdout.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-no-std-prop-build-stdout.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-no-std-property-stderr.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-no-std-prop-stderr.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-no-std-property-stderr.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-no-std-prop-stderr.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-no-std-property/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-no-std-prop/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-no-std-property/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-no-std-prop/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-no-std-property/main.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-no-std-prop/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-no-std-property/main.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-no-std-prop/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-build-stderr.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-build-stderr.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-build-stderr.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-build-stderr.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-build/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-build/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-build/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-build/main.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-build/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-build/main.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-build/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-build/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-build/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-build/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-build/uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-build/uses-std.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-build/uses-std.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-build/uses-std.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-install-stderr.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-install-stderr.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-install-stderr.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-install-stderr.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-install/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-install/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-install/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-install/main.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-install/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-install/main.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-install/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-install/test/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-install/test/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-install/test/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-install/uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-install/uses-std.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-not-in-export-install/uses-std.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-not-in-exp-install/uses-std.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-stderr.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-stderr.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-stderr.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-stderr.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-transitive-not-in-export-build-stderr.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-trans-not-in-exp-build-stderr.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-transitive-not-in-export-build-stderr.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-trans-not-in-exp-build-stderr.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-transitive-not-in-export-install-stderr.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-trans-not-in-exp-install-stderr.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-transitive-not-in-export-install-stderr.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-trans-not-in-exp-install-stderr.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-transitive/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-trans/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-transitive/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-trans/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std-transitive/main.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std-trans/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std-transitive/main.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std-trans/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/imp-std/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-std/main.cxx b/Tests/RunCMake/CXXModulesCompile/examples/imp-std/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/import-std/main.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/imp-std/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-build-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-build-check.cmake deleted file mode 100644 index 21a29b6ac5..0000000000 --- a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-build-check.cmake +++ /dev/null @@ -1,18 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake") -set(item_filter "-ifcOnly") - -check_build_database("export-build-database-imported" "build_database.json" NO_EXIST) -check_build_database("export-build-database-imported" "build_database_CXX.json" NO_EXIST) -if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" NO_EXIST) - check_build_database("export-build-database-imported" "build_database_Debug.json" NO_EXIST) - check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/Debug/CXX_build_database.json" NO_EXIST) - - check_build_database("export-build-database-imported" "build_database_CXX_Release.json" NO_EXIST) - check_build_database("export-build-database-imported" "build_database_Release.json" NO_EXIST) - check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/Release/CXX_build_database.json" NO_EXIST) -else () - check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/CXX_build_database.json" NO_EXIST) -endif () - -string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-check.cmake deleted file mode 100644 index 21a29b6ac5..0000000000 --- a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-check.cmake +++ /dev/null @@ -1,18 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake") -set(item_filter "-ifcOnly") - -check_build_database("export-build-database-imported" "build_database.json" NO_EXIST) -check_build_database("export-build-database-imported" "build_database_CXX.json" NO_EXIST) -if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" NO_EXIST) - check_build_database("export-build-database-imported" "build_database_Debug.json" NO_EXIST) - check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/Debug/CXX_build_database.json" NO_EXIST) - - check_build_database("export-build-database-imported" "build_database_CXX_Release.json" NO_EXIST) - check_build_database("export-build-database-imported" "build_database_Release.json" NO_EXIST) - check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/Release/CXX_build_database.json" NO_EXIST) -else () - check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/CXX_build_database.json" NO_EXIST) -endif () - -string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database-check.cmake deleted file mode 100644 index cfa3a3c066..0000000000 --- a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database-check.cmake +++ /dev/null @@ -1,22 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake") -set(item_filter "-ifcOnly") - -if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database-imported" "build_database.json" ALL_MULTI) - check_build_database("export-build-database-imported" "build_database_CXX.json" JUST_CXX_MULTI) - - check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG) - check_build_database("export-build-database-imported" "build_database_Debug.json" JUST_DEBUG) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) - - check_build_database("export-build-database-imported" "build_database_CXX_Release.json" CXX_AND_RELEASE) - check_build_database("export-build-database-imported" "build_database_Release.json" JUST_RELEASE) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) -else () - check_build_database("export-build-database-imported" "build_database.json" ALL) - check_build_database("export-build-database-imported" "build_database_CXX.json" JUST_CXX) - - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) -endif () - -string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/CXX-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/CXX-check.cmake deleted file mode 100644 index 39203d90d0..0000000000 --- a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/CXX-check.cmake +++ /dev/null @@ -1,22 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake") -set(item_filter "-ifcOnly") - -check_build_database("export-build-database-imported" "build_database.json" NO_EXIST) - -if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database-imported" "build_database_CXX.json" JUST_CXX_MULTI) - - check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG) - check_build_database("export-build-database-imported" "build_database_Debug.json" JUST_DEBUG) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) - - check_build_database("export-build-database-imported" "build_database_CXX_Release.json" CXX_AND_RELEASE) - check_build_database("export-build-database-imported" "build_database_Release.json" JUST_RELEASE) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) -else () - check_build_database("export-build-database-imported" "build_database_CXX.json" JUST_CXX) - - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) -endif () - -string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Debug-check.cmake deleted file mode 100644 index cf01237e96..0000000000 --- a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Debug-check.cmake +++ /dev/null @@ -1,19 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/../../build-database-check.cmake") -set(item_filter "-ifcOnly") - -check_build_database("export-build-database-imported" "build_database.json" NO_EXIST) -check_build_database("export-build-database-imported" "build_database_CXX.json" NO_EXIST) - -if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG) - check_build_database("export-build-database-imported" "build_database_Debug.json" NO_EXIST) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) - - check_build_database("export-build-database-imported" "build_database_CXX_Release.json" NO_EXIST) - check_build_database("export-build-database-imported" "build_database_Release.json" NO_EXIST) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" NO_EXIST) -else () - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) -endif () - -string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Release-Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Release-Release-check.cmake deleted file mode 100644 index 7e231eaf26..0000000000 --- a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Release-Release-check.cmake +++ /dev/null @@ -1,19 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/../../build-database-check.cmake") -set(item_filter "-ifcOnly") - -check_build_database("export-build-database-imported" "build_database.json" NO_EXIST) -check_build_database("export-build-database-imported" "build_database_CXX.json" NO_EXIST) - -if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG) - check_build_database("export-build-database-imported" "build_database_Debug.json" JUST_DEBUG) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) - - check_build_database("export-build-database-imported" "build_database_CXX_Release.json" CXX_AND_RELEASE) - check_build_database("export-build-database-imported" "build_database_Release.json" NO_EXIST) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) -else () - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) -endif () - -string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/Debug-check.cmake deleted file mode 100644 index 876888c12c..0000000000 --- a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/Debug-check.cmake +++ /dev/null @@ -1,19 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake") -set(item_filter "-ifcOnly") - -check_build_database("export-build-database-imported" "build_database.json" NO_EXIST) -check_build_database("export-build-database-imported" "build_database_CXX.json" NO_EXIST) - -if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG) - check_build_database("export-build-database-imported" "build_database_Debug.json" JUST_DEBUG) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) - - check_build_database("export-build-database-imported" "build_database_CXX_Release.json" NO_EXIST) - check_build_database("export-build-database-imported" "build_database_Release.json" NO_EXIST) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" NO_EXIST) -else () - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) -endif () - -string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/Release-check.cmake deleted file mode 100644 index 94edc3b2c8..0000000000 --- a/Tests/RunCMake/CXXModulesCompile/examples/import-modules-export-build-database-target-cmake_build_database/Release-check.cmake +++ /dev/null @@ -1,19 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake") -set(item_filter "-ifcOnly") - -check_build_database("export-build-database-imported" "build_database.json" NO_EXIST) -check_build_database("export-build-database-imported" "build_database_CXX.json" JUST_CXX) - -if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG) - check_build_database("export-build-database-imported" "build_database_Debug.json" JUST_DEBUG) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) - - check_build_database("export-build-database-imported" "build_database_CXX_Release.json" CXX_AND_RELEASE) - check_build_database("export-build-database-imported" "build_database_Release.json" JUST_RELEASE) - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) -else () - check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET) -endif () - -string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-interfaces/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-ifaces/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-interfaces/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-ifaces/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-interfaces/check-for-bmi.cmake b/Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-ifaces/check-for-bmi.cmake similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-interfaces/check-for-bmi.cmake rename to Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-ifaces/check-for-bmi.cmake diff --git a/Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-interfaces/importable.cxx b/Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-ifaces/importable.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-interfaces/importable.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/install-bmi-and-ifaces/importable.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/public-req-private-build-result.txt b/Tests/RunCMake/CXXModulesCompile/examples/public-req-priv-build-result.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/public-req-private-build-result.txt rename to Tests/RunCMake/CXXModulesCompile/examples/public-req-priv-build-result.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/public-req-priv-build-stdout.txt b/Tests/RunCMake/CXXModulesCompile/examples/public-req-priv-build-stdout.txt new file mode 100644 index 0000000000..36222d1466 --- /dev/null +++ b/Tests/RunCMake/CXXModulesCompile/examples/public-req-priv-build-stdout.txt @@ -0,0 +1 @@ +CMake Error: Public C\+\+ module source `.*/Tests/RunCMake/CXXModulesCompile/examples/public-req-priv/pub\.cxx` requires the `priv` C\+\+ module which is provided by a private source diff --git a/Tests/RunCMake/CXXModulesCompile/examples/public-req-private/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/public-req-priv/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/public-req-private/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/public-req-priv/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/public-req-private/priv.cxx b/Tests/RunCMake/CXXModulesCompile/examples/public-req-priv/priv.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/public-req-private/priv.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/public-req-priv/priv.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/public-req-private/pub.cxx b/Tests/RunCMake/CXXModulesCompile/examples/public-req-priv/pub.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/public-req-private/pub.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/public-req-priv/pub.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/public-req-private-build-stdout.txt b/Tests/RunCMake/CXXModulesCompile/examples/public-req-private-build-stdout.txt deleted file mode 100644 index cc4e29ea12..0000000000 --- a/Tests/RunCMake/CXXModulesCompile/examples/public-req-private-build-stdout.txt +++ /dev/null @@ -1 +0,0 @@ -CMake Error: Public C\+\+ module source `.*/Tests/RunCMake/CXXModulesCompile/examples/public-req-private/pub\.cxx` requires the `priv` C\+\+ module which is provided by a private source diff --git a/Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target-build-result.txt b/Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target-build-result.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target-build-result.txt rename to Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target-build-result.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target-build-stdout.txt b/Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target-build-stdout.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target-build-stdout.txt rename to Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target-build-stdout.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target/lib.cxx b/Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target/lib.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target/lib.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target/lib.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target/main.cxx b/Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target/main.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target/priv.cxx b/Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target/priv.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/req-private-other-target/priv.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/req-priv-other-target/priv.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/scan_properties/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/examples/scan_props/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/scan_properties/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/examples/scan_props/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/examples/scan_properties/always_scan.cxx b/Tests/RunCMake/CXXModulesCompile/examples/scan_props/always_scan.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/scan_properties/always_scan.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/scan_props/always_scan.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/scan_properties/join.cxx b/Tests/RunCMake/CXXModulesCompile/examples/scan_props/join.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/scan_properties/join.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/scan_props/join.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/scan_properties/main.cxx b/Tests/RunCMake/CXXModulesCompile/examples/scan_props/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/scan_properties/main.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/scan_props/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/scan_properties/module.cxx b/Tests/RunCMake/CXXModulesCompile/examples/scan_props/module.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/scan_properties/module.cxx rename to Tests/RunCMake/CXXModulesCompile/examples/scan_props/module.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/examples/scan_properties/never_scan.ixx b/Tests/RunCMake/CXXModulesCompile/examples/scan_props/never_scan.ixx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/examples/scan_properties/never_scan.ixx rename to Tests/RunCMake/CXXModulesCompile/examples/scan_props/never_scan.ixx