diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index b29ac57cb7..54a1d8d643 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -629,6 +629,7 @@ add_RunCMake_test(file-STRINGS) add_RunCMake_test(find_file -DMINGW=${MINGW}) add_RunCMake_test(find_library -DMINGW=${MINGW} -DCYGWIN=${CYGWIN} -DMSYS=${MSYS} -DMSVC=${MSVC}) add_RunCMake_test(find_package -DMINGW=${MINGW} -DMSYS=${MSYS}) +add_RunCMake_test(find_package-CPS) add_RunCMake_test(find_path -DMINGW=${MINGW}) add_RunCMake_test(find_program -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}) add_RunCMake_test(foreach) diff --git a/Tests/RunCMake/find_package-CPS/CMakeLists.txt b/Tests/RunCMake/find_package-CPS/CMakeLists.txt new file mode 100644 index 0000000000..955802cde9 --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/CMakeLists.txt @@ -0,0 +1,3 @@ +cmake_minimum_required(VERSION 4.0) +project(${RunCMake_TEST} NONE) +include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/find_package/MissingComponent-result.txt b/Tests/RunCMake/find_package-CPS/MissingComponent-result.txt similarity index 100% rename from Tests/RunCMake/find_package/MissingComponent-result.txt rename to Tests/RunCMake/find_package-CPS/MissingComponent-result.txt diff --git a/Tests/RunCMake/find_package/MissingComponent-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingComponent-stderr.txt similarity index 79% rename from Tests/RunCMake/find_package/MissingComponent-stderr.txt rename to Tests/RunCMake/find_package-CPS/MissingComponent-stderr.txt index 3386c30a2b..d617cfda0c 100644 --- a/Tests/RunCMake/find_package/MissingComponent-stderr.txt +++ b/Tests/RunCMake/find_package-CPS/MissingComponent-stderr.txt @@ -5,7 +5,7 @@ CMake Error at MissingComponent.cmake:[0-9]+ \(find_package\): The following configuration files were considered but not accepted: ( [^ -]*/Tests/RunCMake/find_package/cps/[Cc]omponent[Tt]est\.cps, version: unknown)+ +]*/Tests/RunCMake/find_package-CPS/cps/[Cc]omponent[Tt]est\.cps, version: unknown)+ Call Stack \(most recent call first\): CMakeLists\.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_package/MissingComponent.cmake b/Tests/RunCMake/find_package-CPS/MissingComponent.cmake similarity index 95% rename from Tests/RunCMake/find_package/MissingComponent.cmake rename to Tests/RunCMake/find_package-CPS/MissingComponent.cmake index 215b1316b9..4e1919f872 100644 --- a/Tests/RunCMake/find_package/MissingComponent.cmake +++ b/Tests/RunCMake/find_package-CPS/MissingComponent.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.31) +cmake_minimum_required(VERSION 4.0) set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") diff --git a/Tests/RunCMake/find_package/MissingComponentDependency-result.txt b/Tests/RunCMake/find_package-CPS/MissingComponentDependency-result.txt similarity index 100% rename from Tests/RunCMake/find_package/MissingComponentDependency-result.txt rename to Tests/RunCMake/find_package-CPS/MissingComponentDependency-result.txt diff --git a/Tests/RunCMake/find_package/MissingComponentDependency-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingComponentDependency-stderr.txt similarity index 100% rename from Tests/RunCMake/find_package/MissingComponentDependency-stderr.txt rename to Tests/RunCMake/find_package-CPS/MissingComponentDependency-stderr.txt diff --git a/Tests/RunCMake/find_package/MissingComponentDependency.cmake b/Tests/RunCMake/find_package-CPS/MissingComponentDependency.cmake similarity index 95% rename from Tests/RunCMake/find_package/MissingComponentDependency.cmake rename to Tests/RunCMake/find_package-CPS/MissingComponentDependency.cmake index 576debf272..c987b35ea8 100644 --- a/Tests/RunCMake/find_package/MissingComponentDependency.cmake +++ b/Tests/RunCMake/find_package-CPS/MissingComponentDependency.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.31) +cmake_minimum_required(VERSION 4.0) set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponent-result.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-result.txt similarity index 100% rename from Tests/RunCMake/find_package/MissingTransitiveComponent-result.txt rename to Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-result.txt diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponent-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-stderr.txt similarity index 87% rename from Tests/RunCMake/find_package/MissingTransitiveComponent-stderr.txt rename to Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-stderr.txt index fea5855577..c102911757 100644 --- a/Tests/RunCMake/find_package/MissingTransitiveComponent-stderr.txt +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-stderr.txt @@ -5,7 +5,7 @@ CMake Error in cps/[Tt]ransitive[Mm]issing\.cps: The following configuration files were considered but not accepted: ( [^ -]*/Tests/RunCMake/find_package/cps/[Cc]omponent[Tt]est\.cps, version: unknown)+ +]*/Tests/RunCMake/find_package-CPS/cps/[Cc]omponent[Tt]est\.cps, version: unknown)+ Call Stack \(most recent call first\): MissingTransitiveComponent\.cmake:[0-9]+ \(find_package\) diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponent.cmake b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent.cmake similarity index 95% rename from Tests/RunCMake/find_package/MissingTransitiveComponent.cmake rename to Tests/RunCMake/find_package-CPS/MissingTransitiveComponent.cmake index d0b623b6ea..b8fd02a100 100644 --- a/Tests/RunCMake/find_package/MissingTransitiveComponent.cmake +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.31) +cmake_minimum_required(VERSION 4.0) set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponentDependency-result.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-result.txt similarity index 100% rename from Tests/RunCMake/find_package/MissingTransitiveComponentDependency-result.txt rename to Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-result.txt diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponentDependency-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-stderr.txt similarity index 100% rename from Tests/RunCMake/find_package/MissingTransitiveComponentDependency-stderr.txt rename to Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-stderr.txt diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponentDependency.cmake b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency.cmake similarity index 95% rename from Tests/RunCMake/find_package/MissingTransitiveComponentDependency.cmake rename to Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency.cmake index df40186efb..caf8f3b9aa 100644 --- a/Tests/RunCMake/find_package/MissingTransitiveComponentDependency.cmake +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.31) +cmake_minimum_required(VERSION 4.0) set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") diff --git a/Tests/RunCMake/find_package/MissingTransitiveDependency-result.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-result.txt similarity index 100% rename from Tests/RunCMake/find_package/MissingTransitiveDependency-result.txt rename to Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-result.txt diff --git a/Tests/RunCMake/find_package/MissingTransitiveDependency-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-stderr.txt similarity index 100% rename from Tests/RunCMake/find_package/MissingTransitiveDependency-stderr.txt rename to Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-stderr.txt diff --git a/Tests/RunCMake/find_package/MissingTransitiveDependency.cmake b/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency.cmake similarity index 94% rename from Tests/RunCMake/find_package/MissingTransitiveDependency.cmake rename to Tests/RunCMake/find_package-CPS/MissingTransitiveDependency.cmake index eca412511f..229066a9b7 100644 --- a/Tests/RunCMake/find_package/MissingTransitiveDependency.cmake +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.31) +cmake_minimum_required(VERSION 4.0) set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") diff --git a/Tests/RunCMake/find_package-CPS/RunCMakeTest.cmake b/Tests/RunCMake/find_package-CPS/RunCMakeTest.cmake new file mode 100644 index 0000000000..12e18c66af --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/RunCMakeTest.cmake @@ -0,0 +1,7 @@ +include(RunCMake) + +run_cmake(MissingTransitiveDependency) +run_cmake(MissingComponent) +run_cmake(MissingComponentDependency) +run_cmake(MissingTransitiveComponent) +run_cmake(MissingTransitiveComponentDependency) diff --git a/Tests/RunCMake/find_package/cps/componenttest-extra.cps b/Tests/RunCMake/find_package-CPS/cps/componenttest-extra.cps similarity index 100% rename from Tests/RunCMake/find_package/cps/componenttest-extra.cps rename to Tests/RunCMake/find_package-CPS/cps/componenttest-extra.cps diff --git a/Tests/RunCMake/find_package/cps/componenttest.cps b/Tests/RunCMake/find_package-CPS/cps/componenttest.cps similarity index 100% rename from Tests/RunCMake/find_package/cps/componenttest.cps rename to Tests/RunCMake/find_package-CPS/cps/componenttest.cps diff --git a/Tests/RunCMake/find_package/cps/incomplete.cps b/Tests/RunCMake/find_package-CPS/cps/incomplete.cps similarity index 100% rename from Tests/RunCMake/find_package/cps/incomplete.cps rename to Tests/RunCMake/find_package-CPS/cps/incomplete.cps diff --git a/Tests/RunCMake/find_package/cps/stillincomplete.cps b/Tests/RunCMake/find_package-CPS/cps/stillincomplete.cps similarity index 100% rename from Tests/RunCMake/find_package/cps/stillincomplete.cps rename to Tests/RunCMake/find_package-CPS/cps/stillincomplete.cps diff --git a/Tests/RunCMake/find_package/cps/transitiveincomplete.cps b/Tests/RunCMake/find_package-CPS/cps/transitiveincomplete.cps similarity index 100% rename from Tests/RunCMake/find_package/cps/transitiveincomplete.cps rename to Tests/RunCMake/find_package-CPS/cps/transitiveincomplete.cps diff --git a/Tests/RunCMake/find_package/cps/transitivemissing.cps b/Tests/RunCMake/find_package-CPS/cps/transitivemissing.cps similarity index 100% rename from Tests/RunCMake/find_package/cps/transitivemissing.cps rename to Tests/RunCMake/find_package-CPS/cps/transitivemissing.cps diff --git a/Tests/RunCMake/find_package/RunCMakeTest.cmake b/Tests/RunCMake/find_package/RunCMakeTest.cmake index 27b0c1a197..0552535e61 100644 --- a/Tests/RunCMake/find_package/RunCMakeTest.cmake +++ b/Tests/RunCMake/find_package/RunCMakeTest.cmake @@ -22,11 +22,6 @@ run_cmake_with_options(MissingConfigDebugPkg --debug-find-pkg=NotHere) run_cmake(MissingConfigOneName) run_cmake(MissingConfigRequired) run_cmake(MissingConfigVersion) -run_cmake(MissingTransitiveDependency) -run_cmake(MissingComponent) -run_cmake(MissingComponentDependency) -run_cmake(MissingTransitiveComponent) -run_cmake(MissingTransitiveComponentDependency) run_cmake(MixedModeOptions) run_cmake_with_options(ModuleModeDebugPkg --debug-find-pkg=Foo,Zot) run_cmake(PackageRoot)