From 619c1bacfd98d79888929c29b196db1fc6757534 Mon Sep 17 00:00:00 2001 From: Matthew Woehlke Date: Thu, 6 Feb 2025 13:49:54 -0500 Subject: Tests: Separate out CPS RunCMake/find_package tests The set of RunCMake/find_package tests is quite large, which makes development and management less efficient. While this could probably stand additional refactoring, split out just the CPS tests for now, as those are currently under active development. --- Tests/RunCMake/CMakeLists.txt | 1 + Tests/RunCMake/find_package-CPS/CMakeLists.txt | 3 +++ .../find_package-CPS/MissingComponent-result.txt | 1 + .../find_package-CPS/MissingComponent-stderr.txt | 11 ++++++++ .../find_package-CPS/MissingComponent.cmake | 19 ++++++++++++++ .../MissingComponentDependency-result.txt | 1 + .../MissingComponentDependency-stderr.txt | 22 ++++++++++++++++ .../MissingComponentDependency.cmake | 19 ++++++++++++++ .../MissingTransitiveComponent-result.txt | 1 + .../MissingTransitiveComponent-stderr.txt | 17 ++++++++++++ .../MissingTransitiveComponent.cmake | 19 ++++++++++++++ ...MissingTransitiveComponentDependency-result.txt | 1 + ...MissingTransitiveComponentDependency-stderr.txt | 24 +++++++++++++++++ .../MissingTransitiveComponentDependency.cmake | 20 +++++++++++++++ .../MissingTransitiveDependency-result.txt | 1 + .../MissingTransitiveDependency-stderr.txt | 30 ++++++++++++++++++++++ .../MissingTransitiveDependency.cmake | 19 ++++++++++++++ Tests/RunCMake/find_package-CPS/RunCMakeTest.cmake | 7 +++++ .../find_package-CPS/cps/componenttest-extra.cps | 12 +++++++++ .../find_package-CPS/cps/componenttest.cps | 6 +++++ Tests/RunCMake/find_package-CPS/cps/incomplete.cps | 9 +++++++ .../find_package-CPS/cps/stillincomplete.cps | 9 +++++++ .../find_package-CPS/cps/transitiveincomplete.cps | 11 ++++++++ .../find_package-CPS/cps/transitivemissing.cps | 11 ++++++++ .../find_package/MissingComponent-result.txt | 1 - .../find_package/MissingComponent-stderr.txt | 11 -------- Tests/RunCMake/find_package/MissingComponent.cmake | 19 -------------- .../MissingComponentDependency-result.txt | 1 - .../MissingComponentDependency-stderr.txt | 22 ---------------- .../find_package/MissingComponentDependency.cmake | 19 -------------- .../MissingTransitiveComponent-result.txt | 1 - .../MissingTransitiveComponent-stderr.txt | 17 ------------ .../find_package/MissingTransitiveComponent.cmake | 19 -------------- ...MissingTransitiveComponentDependency-result.txt | 1 - ...MissingTransitiveComponentDependency-stderr.txt | 24 ----------------- .../MissingTransitiveComponentDependency.cmake | 20 --------------- .../MissingTransitiveDependency-result.txt | 1 - .../MissingTransitiveDependency-stderr.txt | 30 ---------------------- .../find_package/MissingTransitiveDependency.cmake | 19 -------------- Tests/RunCMake/find_package/RunCMakeTest.cmake | 5 ---- .../find_package/cps/componenttest-extra.cps | 12 --------- Tests/RunCMake/find_package/cps/componenttest.cps | 6 ----- Tests/RunCMake/find_package/cps/incomplete.cps | 9 ------- .../RunCMake/find_package/cps/stillincomplete.cps | 9 ------- .../find_package/cps/transitiveincomplete.cps | 11 -------- .../find_package/cps/transitivemissing.cps | 11 -------- 46 files changed, 274 insertions(+), 268 deletions(-) create mode 100644 Tests/RunCMake/find_package-CPS/CMakeLists.txt create mode 100644 Tests/RunCMake/find_package-CPS/MissingComponent-result.txt create mode 100644 Tests/RunCMake/find_package-CPS/MissingComponent-stderr.txt create mode 100644 Tests/RunCMake/find_package-CPS/MissingComponent.cmake create mode 100644 Tests/RunCMake/find_package-CPS/MissingComponentDependency-result.txt create mode 100644 Tests/RunCMake/find_package-CPS/MissingComponentDependency-stderr.txt create mode 100644 Tests/RunCMake/find_package-CPS/MissingComponentDependency.cmake create mode 100644 Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-result.txt create mode 100644 Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-stderr.txt create mode 100644 Tests/RunCMake/find_package-CPS/MissingTransitiveComponent.cmake create mode 100644 Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-result.txt create mode 100644 Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-stderr.txt create mode 100644 Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency.cmake create mode 100644 Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-result.txt create mode 100644 Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-stderr.txt create mode 100644 Tests/RunCMake/find_package-CPS/MissingTransitiveDependency.cmake create mode 100644 Tests/RunCMake/find_package-CPS/RunCMakeTest.cmake create mode 100644 Tests/RunCMake/find_package-CPS/cps/componenttest-extra.cps create mode 100644 Tests/RunCMake/find_package-CPS/cps/componenttest.cps create mode 100644 Tests/RunCMake/find_package-CPS/cps/incomplete.cps create mode 100644 Tests/RunCMake/find_package-CPS/cps/stillincomplete.cps create mode 100644 Tests/RunCMake/find_package-CPS/cps/transitiveincomplete.cps create mode 100644 Tests/RunCMake/find_package-CPS/cps/transitivemissing.cps delete mode 100644 Tests/RunCMake/find_package/MissingComponent-result.txt delete mode 100644 Tests/RunCMake/find_package/MissingComponent-stderr.txt delete mode 100644 Tests/RunCMake/find_package/MissingComponent.cmake delete mode 100644 Tests/RunCMake/find_package/MissingComponentDependency-result.txt delete mode 100644 Tests/RunCMake/find_package/MissingComponentDependency-stderr.txt delete mode 100644 Tests/RunCMake/find_package/MissingComponentDependency.cmake delete mode 100644 Tests/RunCMake/find_package/MissingTransitiveComponent-result.txt delete mode 100644 Tests/RunCMake/find_package/MissingTransitiveComponent-stderr.txt delete mode 100644 Tests/RunCMake/find_package/MissingTransitiveComponent.cmake delete mode 100644 Tests/RunCMake/find_package/MissingTransitiveComponentDependency-result.txt delete mode 100644 Tests/RunCMake/find_package/MissingTransitiveComponentDependency-stderr.txt delete mode 100644 Tests/RunCMake/find_package/MissingTransitiveComponentDependency.cmake delete mode 100644 Tests/RunCMake/find_package/MissingTransitiveDependency-result.txt delete mode 100644 Tests/RunCMake/find_package/MissingTransitiveDependency-stderr.txt delete mode 100644 Tests/RunCMake/find_package/MissingTransitiveDependency.cmake delete mode 100644 Tests/RunCMake/find_package/cps/componenttest-extra.cps delete mode 100644 Tests/RunCMake/find_package/cps/componenttest.cps delete mode 100644 Tests/RunCMake/find_package/cps/incomplete.cps delete mode 100644 Tests/RunCMake/find_package/cps/stillincomplete.cps delete mode 100644 Tests/RunCMake/find_package/cps/transitiveincomplete.cps delete mode 100644 Tests/RunCMake/find_package/cps/transitivemissing.cps diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index b29ac57..54a1d8d 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 0000000..955802c --- /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-CPS/MissingComponent-result.txt b/Tests/RunCMake/find_package-CPS/MissingComponent-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingComponent-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/find_package-CPS/MissingComponent-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingComponent-stderr.txt new file mode 100644 index 0000000..d617cfd --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingComponent-stderr.txt @@ -0,0 +1,11 @@ +CMake Error at MissingComponent.cmake:[0-9]+ \(find_package\): + Could not find a configuration file for package "ComponentTest" that is + compatible with requested version ""\. + + The following configuration files were considered but not accepted: +( + [^ +]*/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-CPS/MissingComponent.cmake b/Tests/RunCMake/find_package-CPS/MissingComponent.cmake new file mode 100644 index 0000000..4e1919f --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingComponent.cmake @@ -0,0 +1,19 @@ +cmake_minimum_required(VERSION 4.0) + +set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") + +# Protect tests from running inside the default install prefix. +set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix") + +# Disable built-in search paths. +set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) +set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF) +set(CMAKE_FIND_USE_INSTALL_PREFIX OFF) + +set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + +############################################################################### +# Test requesting unavailable components from a package. +find_package(ComponentTest REQUIRED COMPONENTS DoesNotExist) diff --git a/Tests/RunCMake/find_package-CPS/MissingComponentDependency-result.txt b/Tests/RunCMake/find_package-CPS/MissingComponentDependency-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingComponentDependency-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/find_package-CPS/MissingComponentDependency-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingComponentDependency-stderr.txt new file mode 100644 index 0000000..939a094 --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingComponentDependency-stderr.txt @@ -0,0 +1,22 @@ +CMake Error in cps/componenttest-extra\.cps: + Could not find a package configuration file provided by "DoesNotExist" with + any of the following names: + + DoesNotExist\.cps + doesnotexist\.cps + DoesNotExistConfig\.cmake + doesnotexist-config\.cmake + + Add the installation prefix of "DoesNotExist" to CMAKE_PREFIX_PATH or set + "DoesNotExist_DIR" to a directory containing one of the above files\. If + "DoesNotExist" provides a separate development package or SDK, be sure it + has been installed\. +Call Stack \(most recent call first\): + cps/[Cc]omponent[Tt]est\.cps + MissingComponentDependency\.cmake:[0-9]+ \(find_package\) + CMakeLists\.txt:[0-9]+ \(include\) ++ +CMake Error at MissingComponentDependency.cmake:[0-9]+ \(find_package\): + find_package could not find DoesNotExist, required by ComponentTest\. +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_package-CPS/MissingComponentDependency.cmake b/Tests/RunCMake/find_package-CPS/MissingComponentDependency.cmake new file mode 100644 index 0000000..c987b35 --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingComponentDependency.cmake @@ -0,0 +1,19 @@ +cmake_minimum_required(VERSION 4.0) + +set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") + +# Protect tests from running inside the default install prefix. +set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix") + +# Disable built-in search paths. +set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) +set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF) +set(CMAKE_FIND_USE_INSTALL_PREFIX OFF) + +set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + +############################################################################### +# Test requesting components with missing dependencies from a package. +find_package(ComponentTest REQUIRED COMPONENTS Incomplete) diff --git a/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-result.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-stderr.txt new file mode 100644 index 0000000..c102911 --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent-stderr.txt @@ -0,0 +1,17 @@ +CMake Error in cps/[Tt]ransitive[Mm]issing\.cps: + Could not find a configuration file for package "ComponentTest" that is + compatible with requested version ""\. + + The following configuration files were considered but not accepted: +( + [^ +]*/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\) + CMakeLists\.txt:[0-9]+ \(include\) ++ +CMake Error at MissingTransitiveComponent\.cmake:[0-9]+ \(find_package\): + find_package could not find ComponentTest, required by TransitiveMissing\. +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent.cmake b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent.cmake new file mode 100644 index 0000000..b8fd02a --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponent.cmake @@ -0,0 +1,19 @@ +cmake_minimum_required(VERSION 4.0) + +set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") + +# Protect tests from running inside the default install prefix. +set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix") + +# Disable built-in search paths. +set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) +set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF) +set(CMAKE_FIND_USE_INSTALL_PREFIX OFF) + +set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + +############################################################################### +# Test depending on components of another package which are unavailable. +find_package(TransitiveMissing REQUIRED) diff --git a/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-result.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-stderr.txt new file mode 100644 index 0000000..98814d4 --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency-stderr.txt @@ -0,0 +1,24 @@ +CMake Error in cps/componenttest-extra\.cps: + Could not find a package configuration file provided by "DoesNotExist" with + any of the following names: + + DoesNotExist\.cps + doesnotexist\.cps + DoesNotExistConfig\.cmake + doesnotexist-config\.cmake + + Add the installation prefix of "DoesNotExist" to CMAKE_PREFIX_PATH or set + "DoesNotExist_DIR" to a directory containing one of the above files\. If + "DoesNotExist" provides a separate development package or SDK, be sure it + has been installed\. +Call Stack \(most recent call first\): + cps/[Cc]omponent[Tt]est\.cps + cps/[Tt]ransitive[Ii]ncomplete\.cps + MissingTransitiveComponentDependency\.cmake:[0-9]+ \(find_package\) + CMakeLists\.txt:[0-9]+ \(include\) ++ +CMake Error at MissingTransitiveComponentDependency\.cmake:[0-9]+ \(find_package\): + find_package could not find ComponentTest, required by + TransitiveIncomplete\. +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency.cmake b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency.cmake new file mode 100644 index 0000000..caf8f3b --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency.cmake @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 4.0) + +set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") + +# Protect tests from running inside the default install prefix. +set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix") + +# Disable built-in search paths. +set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) +set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF) +set(CMAKE_FIND_USE_INSTALL_PREFIX OFF) + +set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + +############################################################################### +# Test depending on components of another package which are missing +# dependencies. +find_package(TransitiveIncomplete REQUIRED) diff --git a/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-result.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-stderr.txt new file mode 100644 index 0000000..eaa3cd2 --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-stderr.txt @@ -0,0 +1,30 @@ +CMake Warning \(dev\) at MissingTransitiveDependency\.cmake:[0-9]+ \(find_package\): + CMake's support for importing package information in the Common Package + Specification format \(via find_package\) is experimental\. It is meant only + for experimentation and feedback to CMake developers. +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\) +This warning is for project developers. Use -Wno-dev to suppress it. ++ +CMake Error in cps/[Ss]till[Ii]ncomplete\.cps: + Could not find a package configuration file provided by "DoesNotExist" with + any of the following names: + + DoesNotExist\.cps + doesnotexist\.cps + DoesNotExistConfig\.cmake + doesnotexist-config\.cmake + + Add the installation prefix of "DoesNotExist" to CMAKE_PREFIX_PATH or set + "DoesNotExist_DIR" to a directory containing one of the above files\. If + "DoesNotExist" provides a separate development package or SDK, be sure it + has been installed\. +Call Stack \(most recent call first\): + cps/[Ii]ncomplete\.cps + MissingTransitiveDependency\.cmake:[0-9]+ \(find_package\) + CMakeLists\.txt:[0-9]+ \(include\) ++ +CMake Error at MissingTransitiveDependency\.cmake:[0-9]+ \(find_package\): + find_package could not find StillIncomplete, required by Incomplete\. +Call Stack \(most recent call first\): + CMakeLists\.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency.cmake b/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency.cmake new file mode 100644 index 0000000..229066a --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/MissingTransitiveDependency.cmake @@ -0,0 +1,19 @@ +cmake_minimum_required(VERSION 4.0) + +set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") + +# Protect tests from running inside the default install prefix. +set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix") + +# Disable built-in search paths. +set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) +set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) +set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF) +set(CMAKE_FIND_USE_INSTALL_PREFIX OFF) + +set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + +############################################################################### +# Test finding a package that is missing dependencies. +find_package(Incomplete REQUIRED) diff --git a/Tests/RunCMake/find_package-CPS/RunCMakeTest.cmake b/Tests/RunCMake/find_package-CPS/RunCMakeTest.cmake new file mode 100644 index 0000000..12e18c6 --- /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/cps/componenttest-extra.cps b/Tests/RunCMake/find_package-CPS/cps/componenttest-extra.cps new file mode 100644 index 0000000..7cca03e --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/cps/componenttest-extra.cps @@ -0,0 +1,12 @@ +{ + "cps_version": "0.13", + "name": "ComponentTest", + "requires": { + "DoesNotExist": null + }, + "components": { + "Incomplete": { + "type": "interface" + } + } +} diff --git a/Tests/RunCMake/find_package-CPS/cps/componenttest.cps b/Tests/RunCMake/find_package-CPS/cps/componenttest.cps new file mode 100644 index 0000000..ef49af4 --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/cps/componenttest.cps @@ -0,0 +1,6 @@ +{ + "cps_version": "0.13", + "name": "ComponentTest", + "cps_path": "@prefix@/cps", + "components": {} +} diff --git a/Tests/RunCMake/find_package-CPS/cps/incomplete.cps b/Tests/RunCMake/find_package-CPS/cps/incomplete.cps new file mode 100644 index 0000000..4d3a104 --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/cps/incomplete.cps @@ -0,0 +1,9 @@ +{ + "cps_version": "0.13", + "name": "Incomplete", + "cps_path": "@prefix@/cps", + "requires": { + "StillIncomplete": null + }, + "components": {} +} diff --git a/Tests/RunCMake/find_package-CPS/cps/stillincomplete.cps b/Tests/RunCMake/find_package-CPS/cps/stillincomplete.cps new file mode 100644 index 0000000..12d23ac --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/cps/stillincomplete.cps @@ -0,0 +1,9 @@ +{ + "cps_version": "0.13", + "name": "StillIncomplete", + "cps_path": "@prefix@/cps", + "requires": { + "DoesNotExist": null + }, + "components": {} +} diff --git a/Tests/RunCMake/find_package-CPS/cps/transitiveincomplete.cps b/Tests/RunCMake/find_package-CPS/cps/transitiveincomplete.cps new file mode 100644 index 0000000..9d0f8c2 --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/cps/transitiveincomplete.cps @@ -0,0 +1,11 @@ +{ + "cps_version": "0.13", + "name": "TransitiveIncomplete", + "cps_path": "@prefix@/cps", + "requires": { + "ComponentTest": { + "components": [ "Incomplete" ] + } + }, + "components": {} +} diff --git a/Tests/RunCMake/find_package-CPS/cps/transitivemissing.cps b/Tests/RunCMake/find_package-CPS/cps/transitivemissing.cps new file mode 100644 index 0000000..2a294aa --- /dev/null +++ b/Tests/RunCMake/find_package-CPS/cps/transitivemissing.cps @@ -0,0 +1,11 @@ +{ + "cps_version": "0.13", + "name": "TransitiveMissing", + "cps_path": "@prefix@/cps", + "requires": { + "ComponentTest": { + "components": [ "DoesNotExist" ] + } + }, + "components": {} +} diff --git a/Tests/RunCMake/find_package/MissingComponent-result.txt b/Tests/RunCMake/find_package/MissingComponent-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/find_package/MissingComponent-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/find_package/MissingComponent-stderr.txt b/Tests/RunCMake/find_package/MissingComponent-stderr.txt deleted file mode 100644 index 3386c30..0000000 --- a/Tests/RunCMake/find_package/MissingComponent-stderr.txt +++ /dev/null @@ -1,11 +0,0 @@ -CMake Error at MissingComponent.cmake:[0-9]+ \(find_package\): - Could not find a configuration file for package "ComponentTest" that is - compatible with requested version ""\. - - The following configuration files were considered but not accepted: -( - [^ -]*/Tests/RunCMake/find_package/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/MissingComponent.cmake deleted file mode 100644 index 215b131..0000000 --- a/Tests/RunCMake/find_package/MissingComponent.cmake +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 3.31) - -set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") - -# Protect tests from running inside the default install prefix. -set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix") - -# Disable built-in search paths. -set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF) -set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) -set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) -set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF) -set(CMAKE_FIND_USE_INSTALL_PREFIX OFF) - -set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}) - -############################################################################### -# Test requesting unavailable components from a package. -find_package(ComponentTest REQUIRED COMPONENTS DoesNotExist) diff --git a/Tests/RunCMake/find_package/MissingComponentDependency-result.txt b/Tests/RunCMake/find_package/MissingComponentDependency-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/find_package/MissingComponentDependency-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/find_package/MissingComponentDependency-stderr.txt b/Tests/RunCMake/find_package/MissingComponentDependency-stderr.txt deleted file mode 100644 index 939a094..0000000 --- a/Tests/RunCMake/find_package/MissingComponentDependency-stderr.txt +++ /dev/null @@ -1,22 +0,0 @@ -CMake Error in cps/componenttest-extra\.cps: - Could not find a package configuration file provided by "DoesNotExist" with - any of the following names: - - DoesNotExist\.cps - doesnotexist\.cps - DoesNotExistConfig\.cmake - doesnotexist-config\.cmake - - Add the installation prefix of "DoesNotExist" to CMAKE_PREFIX_PATH or set - "DoesNotExist_DIR" to a directory containing one of the above files\. If - "DoesNotExist" provides a separate development package or SDK, be sure it - has been installed\. -Call Stack \(most recent call first\): - cps/[Cc]omponent[Tt]est\.cps - MissingComponentDependency\.cmake:[0-9]+ \(find_package\) - CMakeLists\.txt:[0-9]+ \(include\) -+ -CMake Error at MissingComponentDependency.cmake:[0-9]+ \(find_package\): - find_package could not find DoesNotExist, required by ComponentTest\. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_package/MissingComponentDependency.cmake b/Tests/RunCMake/find_package/MissingComponentDependency.cmake deleted file mode 100644 index 576debf..0000000 --- a/Tests/RunCMake/find_package/MissingComponentDependency.cmake +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 3.31) - -set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") - -# Protect tests from running inside the default install prefix. -set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix") - -# Disable built-in search paths. -set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF) -set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) -set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) -set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF) -set(CMAKE_FIND_USE_INSTALL_PREFIX OFF) - -set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}) - -############################################################################### -# Test requesting components with missing dependencies from a package. -find_package(ComponentTest REQUIRED COMPONENTS Incomplete) diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponent-result.txt b/Tests/RunCMake/find_package/MissingTransitiveComponent-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/find_package/MissingTransitiveComponent-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponent-stderr.txt b/Tests/RunCMake/find_package/MissingTransitiveComponent-stderr.txt deleted file mode 100644 index fea5855..0000000 --- a/Tests/RunCMake/find_package/MissingTransitiveComponent-stderr.txt +++ /dev/null @@ -1,17 +0,0 @@ -CMake Error in cps/[Tt]ransitive[Mm]issing\.cps: - Could not find a configuration file for package "ComponentTest" that is - compatible with requested version ""\. - - The following configuration files were considered but not accepted: -( - [^ -]*/Tests/RunCMake/find_package/cps/[Cc]omponent[Tt]est\.cps, version: unknown)+ - -Call Stack \(most recent call first\): - MissingTransitiveComponent\.cmake:[0-9]+ \(find_package\) - CMakeLists\.txt:[0-9]+ \(include\) -+ -CMake Error at MissingTransitiveComponent\.cmake:[0-9]+ \(find_package\): - find_package could not find ComponentTest, required by TransitiveMissing\. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponent.cmake b/Tests/RunCMake/find_package/MissingTransitiveComponent.cmake deleted file mode 100644 index d0b623b..0000000 --- a/Tests/RunCMake/find_package/MissingTransitiveComponent.cmake +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 3.31) - -set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") - -# Protect tests from running inside the default install prefix. -set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix") - -# Disable built-in search paths. -set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF) -set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) -set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) -set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF) -set(CMAKE_FIND_USE_INSTALL_PREFIX OFF) - -set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}) - -############################################################################### -# Test depending on components of another package which are unavailable. -find_package(TransitiveMissing REQUIRED) diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponentDependency-result.txt b/Tests/RunCMake/find_package/MissingTransitiveComponentDependency-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/find_package/MissingTransitiveComponentDependency-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponentDependency-stderr.txt b/Tests/RunCMake/find_package/MissingTransitiveComponentDependency-stderr.txt deleted file mode 100644 index 98814d4..0000000 --- a/Tests/RunCMake/find_package/MissingTransitiveComponentDependency-stderr.txt +++ /dev/null @@ -1,24 +0,0 @@ -CMake Error in cps/componenttest-extra\.cps: - Could not find a package configuration file provided by "DoesNotExist" with - any of the following names: - - DoesNotExist\.cps - doesnotexist\.cps - DoesNotExistConfig\.cmake - doesnotexist-config\.cmake - - Add the installation prefix of "DoesNotExist" to CMAKE_PREFIX_PATH or set - "DoesNotExist_DIR" to a directory containing one of the above files\. If - "DoesNotExist" provides a separate development package or SDK, be sure it - has been installed\. -Call Stack \(most recent call first\): - cps/[Cc]omponent[Tt]est\.cps - cps/[Tt]ransitive[Ii]ncomplete\.cps - MissingTransitiveComponentDependency\.cmake:[0-9]+ \(find_package\) - CMakeLists\.txt:[0-9]+ \(include\) -+ -CMake Error at MissingTransitiveComponentDependency\.cmake:[0-9]+ \(find_package\): - find_package could not find ComponentTest, required by - TransitiveIncomplete\. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_package/MissingTransitiveComponentDependency.cmake b/Tests/RunCMake/find_package/MissingTransitiveComponentDependency.cmake deleted file mode 100644 index df40186..0000000 --- a/Tests/RunCMake/find_package/MissingTransitiveComponentDependency.cmake +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.31) - -set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") - -# Protect tests from running inside the default install prefix. -set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix") - -# Disable built-in search paths. -set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF) -set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) -set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) -set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF) -set(CMAKE_FIND_USE_INSTALL_PREFIX OFF) - -set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}) - -############################################################################### -# Test depending on components of another package which are missing -# dependencies. -find_package(TransitiveIncomplete REQUIRED) diff --git a/Tests/RunCMake/find_package/MissingTransitiveDependency-result.txt b/Tests/RunCMake/find_package/MissingTransitiveDependency-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/find_package/MissingTransitiveDependency-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/find_package/MissingTransitiveDependency-stderr.txt b/Tests/RunCMake/find_package/MissingTransitiveDependency-stderr.txt deleted file mode 100644 index eaa3cd2..0000000 --- a/Tests/RunCMake/find_package/MissingTransitiveDependency-stderr.txt +++ /dev/null @@ -1,30 +0,0 @@ -CMake Warning \(dev\) at MissingTransitiveDependency\.cmake:[0-9]+ \(find_package\): - CMake's support for importing package information in the Common Package - Specification format \(via find_package\) is experimental\. It is meant only - for experimentation and feedback to CMake developers. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) -This warning is for project developers. Use -Wno-dev to suppress it. -+ -CMake Error in cps/[Ss]till[Ii]ncomplete\.cps: - Could not find a package configuration file provided by "DoesNotExist" with - any of the following names: - - DoesNotExist\.cps - doesnotexist\.cps - DoesNotExistConfig\.cmake - doesnotexist-config\.cmake - - Add the installation prefix of "DoesNotExist" to CMAKE_PREFIX_PATH or set - "DoesNotExist_DIR" to a directory containing one of the above files\. If - "DoesNotExist" provides a separate development package or SDK, be sure it - has been installed\. -Call Stack \(most recent call first\): - cps/[Ii]ncomplete\.cps - MissingTransitiveDependency\.cmake:[0-9]+ \(find_package\) - CMakeLists\.txt:[0-9]+ \(include\) -+ -CMake Error at MissingTransitiveDependency\.cmake:[0-9]+ \(find_package\): - find_package could not find StillIncomplete, required by Incomplete\. -Call Stack \(most recent call first\): - CMakeLists\.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/find_package/MissingTransitiveDependency.cmake b/Tests/RunCMake/find_package/MissingTransitiveDependency.cmake deleted file mode 100644 index eca4125..0000000 --- a/Tests/RunCMake/find_package/MissingTransitiveDependency.cmake +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 3.31) - -set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261") - -# Protect tests from running inside the default install prefix. -set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix") - -# Disable built-in search paths. -set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF) -set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF) -set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF) -set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF) -set(CMAKE_FIND_USE_INSTALL_PREFIX OFF) - -set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}) - -############################################################################### -# Test finding a package that is missing dependencies. -find_package(Incomplete REQUIRED) diff --git a/Tests/RunCMake/find_package/RunCMakeTest.cmake b/Tests/RunCMake/find_package/RunCMakeTest.cmake index 27b0c1a..0552535 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) diff --git a/Tests/RunCMake/find_package/cps/componenttest-extra.cps b/Tests/RunCMake/find_package/cps/componenttest-extra.cps deleted file mode 100644 index 7cca03e..0000000 --- a/Tests/RunCMake/find_package/cps/componenttest-extra.cps +++ /dev/null @@ -1,12 +0,0 @@ -{ - "cps_version": "0.13", - "name": "ComponentTest", - "requires": { - "DoesNotExist": null - }, - "components": { - "Incomplete": { - "type": "interface" - } - } -} diff --git a/Tests/RunCMake/find_package/cps/componenttest.cps b/Tests/RunCMake/find_package/cps/componenttest.cps deleted file mode 100644 index ef49af4..0000000 --- a/Tests/RunCMake/find_package/cps/componenttest.cps +++ /dev/null @@ -1,6 +0,0 @@ -{ - "cps_version": "0.13", - "name": "ComponentTest", - "cps_path": "@prefix@/cps", - "components": {} -} diff --git a/Tests/RunCMake/find_package/cps/incomplete.cps b/Tests/RunCMake/find_package/cps/incomplete.cps deleted file mode 100644 index 4d3a104..0000000 --- a/Tests/RunCMake/find_package/cps/incomplete.cps +++ /dev/null @@ -1,9 +0,0 @@ -{ - "cps_version": "0.13", - "name": "Incomplete", - "cps_path": "@prefix@/cps", - "requires": { - "StillIncomplete": null - }, - "components": {} -} diff --git a/Tests/RunCMake/find_package/cps/stillincomplete.cps b/Tests/RunCMake/find_package/cps/stillincomplete.cps deleted file mode 100644 index 12d23ac..0000000 --- a/Tests/RunCMake/find_package/cps/stillincomplete.cps +++ /dev/null @@ -1,9 +0,0 @@ -{ - "cps_version": "0.13", - "name": "StillIncomplete", - "cps_path": "@prefix@/cps", - "requires": { - "DoesNotExist": null - }, - "components": {} -} diff --git a/Tests/RunCMake/find_package/cps/transitiveincomplete.cps b/Tests/RunCMake/find_package/cps/transitiveincomplete.cps deleted file mode 100644 index 9d0f8c2..0000000 --- a/Tests/RunCMake/find_package/cps/transitiveincomplete.cps +++ /dev/null @@ -1,11 +0,0 @@ -{ - "cps_version": "0.13", - "name": "TransitiveIncomplete", - "cps_path": "@prefix@/cps", - "requires": { - "ComponentTest": { - "components": [ "Incomplete" ] - } - }, - "components": {} -} diff --git a/Tests/RunCMake/find_package/cps/transitivemissing.cps b/Tests/RunCMake/find_package/cps/transitivemissing.cps deleted file mode 100644 index 2a294aa..0000000 --- a/Tests/RunCMake/find_package/cps/transitivemissing.cps +++ /dev/null @@ -1,11 +0,0 @@ -{ - "cps_version": "0.13", - "name": "TransitiveMissing", - "cps_path": "@prefix@/cps", - "requires": { - "ComponentTest": { - "components": [ "DoesNotExist" ] - } - }, - "components": {} -} -- cgit v0.12