diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-30 13:29:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-06-30 13:29:27 (GMT) |
| commit | 1ac0dea4c8343d3f3a95b4a143fa47e4a785ff32 (patch) | |
| tree | c331a308667e15e612d898e5b78a04c2df5f795a /Tests | |
| parent | 67cf379354d0681b4d9fe0e73d38c6fac26715e6 (diff) | |
| parent | 9ede4cab2ba8a405749c09922a7fe54c70ecc190 (diff) | |
| download | CMake-1ac0dea4c8343d3f3a95b4a143fa47e4a785ff32.zip CMake-1ac0dea4c8343d3f3a95b4a143fa47e4a785ff32.tar.gz CMake-1ac0dea4c8343d3f3a95b4a143fa47e4a785ff32.tar.bz2 | |
Merge topic 'FetchContent-unparsed-arguments' into release-3.27
9ede4cab2b FetchContent: Protect ExternalProject keywords from unknown arguments
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !8598
Diffstat (limited to 'Tests')
4 files changed, 4 insertions, 4 deletions
diff --git a/Tests/RunCMake/DependencyProviders/FetchContentSerial-stdout.txt b/Tests/RunCMake/DependencyProviders/FetchContentSerial-stdout.txt index fa4a794..5cda903 100644 --- a/Tests/RunCMake/DependencyProviders/FetchContentSerial-stdout.txt +++ b/Tests/RunCMake/DependencyProviders/FetchContentSerial-stdout.txt @@ -2,6 +2,6 @@ -- After cmake_language -- AThing_FOUND = 0 -- Intercepted FetchContent_MakeAvailable\(SomeDep\) --- Provider invoked for method FETCHCONTENT_MAKEAVAILABLE_SERIAL with args: SOURCE_DIR;.*/Tests/RunCMake/DependencyProviders;BINARY_DIR;.*/Tests/RunCMake/DependencyProviders/FetchContentSerial-build/_deps/somedep-build;SOURCE_SUBDIR;DoesNotExist +-- Provider invoked for method FETCHCONTENT_MAKEAVAILABLE_SERIAL with args: SOURCE_DIR;.*/Tests/RunCMake/DependencyProviders;BINARY_DIR;.*/Tests/RunCMake/DependencyProviders/FetchContentSerial-build/_deps/somedep-build;EXTERNALPROJECT_INTERNAL_ARGUMENT_SEPARATOR;SOURCE_SUBDIR;DoesNotExist -- FetchContent_MakeAvailable\(\) succeeded -- Configuring done diff --git a/Tests/RunCMake/DependencyProviders/PassThroughProvider-stdout.txt b/Tests/RunCMake/DependencyProviders/PassThroughProvider-stdout.txt index 0c9303a..5e412c4 100644 --- a/Tests/RunCMake/DependencyProviders/PassThroughProvider-stdout.txt +++ b/Tests/RunCMake/DependencyProviders/PassThroughProvider-stdout.txt @@ -4,4 +4,4 @@ -- Provider invoked for method FIND_PACKAGE with args: AThing;QUIET -- AThing_FOUND = 0 -- Null provider called --- Provider invoked for method FETCHCONTENT_MAKEAVAILABLE_SERIAL with args: SomeDep;SOURCE_DIR;.*/Tests/RunCMake/DependencyProviders;BINARY_DIR;.*/Tests/RunCMake/DependencyProviders/PassThroughProvider-build/_deps/somedep-build;SOURCE_SUBDIR;DoesNotExist +-- Provider invoked for method FETCHCONTENT_MAKEAVAILABLE_SERIAL with args: SomeDep;SOURCE_DIR;.*/Tests/RunCMake/DependencyProviders;BINARY_DIR;.*/Tests/RunCMake/DependencyProviders/PassThroughProvider-build/_deps/somedep-build;EXTERNALPROJECT_INTERNAL_ARGUMENT_SEPARATOR;SOURCE_SUBDIR;DoesNotExist diff --git a/Tests/RunCMake/DependencyProviders/Recurse-stdout.txt b/Tests/RunCMake/DependencyProviders/Recurse-stdout.txt index 2c2035a..25824cb 100644 --- a/Tests/RunCMake/DependencyProviders/Recurse-stdout.txt +++ b/Tests/RunCMake/DependencyProviders/Recurse-stdout.txt @@ -1,7 +1,7 @@ -- Before cmake_language -- After cmake_language -- Intercepted FetchContent_MakeAvailable\(SomeDep\) --- Provider invoked for method FETCHCONTENT_MAKEAVAILABLE_SERIAL with args: SOURCE_DIR;.*/Tests/RunCMake/DependencyProviders/Recurse-build/_deps/somedep-src;BINARY_DIR;.*/Tests/RunCMake/DependencyProviders/Recurse-build/_deps/somedep-build;DOWNLOAD_COMMAND;.*/cmake(\.exe)?;-E;echo;Download command called +-- Provider invoked for method FETCHCONTENT_MAKEAVAILABLE_SERIAL with args: SOURCE_DIR;.*/Tests/RunCMake/DependencyProviders/Recurse-build/_deps/somedep-src;BINARY_DIR;.*/Tests/RunCMake/DependencyProviders/Recurse-build/_deps/somedep-build;EXTERNALPROJECT_INTERNAL_ARGUMENT_SEPARATOR;DOWNLOAD_COMMAND;.*/cmake(\.exe)?;-E;echo;Download command called .*Download command called .*-- Should now be handled -- Configuring done diff --git a/Tests/RunCMake/DependencyProviders/RedirectFetchContentSerial-stdout.txt b/Tests/RunCMake/DependencyProviders/RedirectFetchContentSerial-stdout.txt index a293324..06f94e5 100644 --- a/Tests/RunCMake/DependencyProviders/RedirectFetchContentSerial-stdout.txt +++ b/Tests/RunCMake/DependencyProviders/RedirectFetchContentSerial-stdout.txt @@ -2,4 +2,4 @@ -- After cmake_language -- AThing_FOUND = 0 -- Redirecting FetchContent_MakeAvailable\(SomeDep\) to find_package\(\) --- Provider invoked for method FETCHCONTENT_MAKEAVAILABLE_SERIAL with args: SOURCE_DIR;.*/Tests/RunCMake/DependencyProviders;BINARY_DIR;.*/Tests/RunCMake/DependencyProviders/RedirectFetchContentSerial-build/_deps/somedep-build;SOURCE_SUBDIR;DoesNotExist +-- Provider invoked for method FETCHCONTENT_MAKEAVAILABLE_SERIAL with args: SOURCE_DIR;.*/Tests/RunCMake/DependencyProviders;BINARY_DIR;.*/Tests/RunCMake/DependencyProviders/RedirectFetchContentSerial-build/_deps/somedep-build;EXTERNALPROJECT_INTERNAL_ARGUMENT_SEPARATOR;SOURCE_SUBDIR;DoesNotExist |