diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 8d7a13b206..e66e32556c 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -223,6 +223,7 @@ add_RunCMake_test(GenEx-COMPILE_LANGUAGE) add_RunCMake_test(GenEx-COMPILE_LANG_AND_ID) add_RunCMake_test(GenEx-LINK_LANGUAGE) add_RunCMake_test(GenEx-LINK_LANG_AND_ID) +add_RunCMake_test(GenEx-HOST_LINK) add_RunCMake_test(GeneratorExpression) add_RunCMake_test(GeneratorInstance) add_RunCMake_test(GeneratorPlatform) diff --git a/Tests/RunCMake/GenEx-HOST_LINK/CMakeLists.txt b/Tests/RunCMake/GenEx-HOST_LINK/CMakeLists.txt new file mode 100644 index 0000000000..b646c4ac67 --- /dev/null +++ b/Tests/RunCMake/GenEx-HOST_LINK/CMakeLists.txt @@ -0,0 +1,3 @@ +cmake_minimum_required(VERSION 3.18) +project(${RunCMake_TEST} NONE) +include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_command-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_command-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_command-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_command-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_command.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_command.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_target-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_target-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_target-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_target-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_target.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_custom_target.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_executable-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_executable-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_executable-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_executable-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_executable.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_executable.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_library-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_library-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_library-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_library-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_library.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_library.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_test-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_test-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_test-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_test-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-add_test.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-add_test.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-install-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-install-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-install-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-install-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-install.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-install.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-link_depends-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-link_depends-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-link_depends-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-link_depends-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-link_depends.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-link_depends.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_definitions-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_definitions-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_definitions-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_definitions-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_definitions.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_definitions.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_options-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_options-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_options-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_options-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_options.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_compile_options.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_include_directories-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_include_directories-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_include_directories-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_include_directories-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_include_directories.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_include_directories.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_directories-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_directories-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_directories-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_directories-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_directories.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_directories.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_libraries-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_libraries-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_libraries-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_libraries-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_libraries.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_link_libraries.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries.cmake diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_sources-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources-result.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_sources-result.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources-result.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_sources-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources-stderr.txt similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_sources-stderr.txt rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources-stderr.txt diff --git a/Tests/RunCMake/GeneratorExpression/HOST_LINK-target_sources.cmake b/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources.cmake similarity index 100% rename from Tests/RunCMake/GeneratorExpression/HOST_LINK-target_sources.cmake rename to Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources.cmake diff --git a/Tests/RunCMake/GenEx-HOST_LINK/RunCMakeTest.cmake b/Tests/RunCMake/GenEx-HOST_LINK/RunCMakeTest.cmake new file mode 100644 index 0000000000..329a7c6bc1 --- /dev/null +++ b/Tests/RunCMake/GenEx-HOST_LINK/RunCMakeTest.cmake @@ -0,0 +1,17 @@ +include(RunCMake) + +run_cmake(HOST_LINK-add_custom_target) +run_cmake(HOST_LINK-add_custom_command) +run_cmake(HOST_LINK-install) +run_cmake(HOST_LINK-add_executable) +run_cmake(HOST_LINK-add_library) +run_cmake(HOST_LINK-add_test) +run_cmake(HOST_LINK-target_sources) +run_cmake(HOST_LINK-target_compile_definitions) +run_cmake(HOST_LINK-target_compile_options) +run_cmake(HOST_LINK-target_include_directories) +run_cmake(HOST_LINK-target_link_libraries) +run_cmake(HOST_LINK-target_link_directories) +if(RunCMake_GENERATOR MATCHES "(Ninja|Makefile)") + run_cmake(HOST_LINK-link_depends) +endif() diff --git a/Tests/RunCMake/GenEx-HOST_LINK/empty.c b/Tests/RunCMake/GenEx-HOST_LINK/empty.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake index 54fb5cbffb..dfe6695518 100644 --- a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake +++ b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake @@ -23,21 +23,6 @@ run_cmake(NonValidTarget-TARGET_BUNDLE_DIR) run_cmake(NonValidTarget-TARGET_BUNDLE_CONTENT_DIR) run_cmake(NonValidTarget-TARGET_PROPERTY) run_cmake(NonValidTarget-TARGET_POLICY) -run_cmake(HOST_LINK-add_custom_target) -run_cmake(HOST_LINK-add_custom_command) -run_cmake(HOST_LINK-install) -run_cmake(HOST_LINK-add_executable) -run_cmake(HOST_LINK-add_library) -run_cmake(HOST_LINK-add_test) -run_cmake(HOST_LINK-target_sources) -run_cmake(HOST_LINK-target_compile_definitions) -run_cmake(HOST_LINK-target_compile_options) -run_cmake(HOST_LINK-target_include_directories) -run_cmake(HOST_LINK-target_link_libraries) -run_cmake(HOST_LINK-target_link_directories) -if(RunCMake_GENERATOR MATCHES "(Ninja|Makefile)") - run_cmake(HOST_LINK-link_depends) -endif() run_cmake(DEVICE_LINK-add_custom_target) run_cmake(DEVICE_LINK-add_custom_command) run_cmake(DEVICE_LINK-install)