diff options
| author | Craig Scott <craig.scott@crascit.com> | 2024-05-13 10:24:03 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2024-05-13 10:24:47 (GMT) |
| commit | 173daad58de172ad5edbbf72117b5597c7339007 (patch) | |
| tree | 55af3f1352d1eef00574cf2552bb2caf1037800a /Tests/RunCMake | |
| parent | 462e58326730d1ee06bb19006e1887e104d8f5e9 (diff) | |
| download | CMake-173daad58de172ad5edbbf72117b5597c7339007.zip CMake-173daad58de172ad5edbbf72117b5597c7339007.tar.gz CMake-173daad58de172ad5edbbf72117b5597c7339007.tar.bz2 | |
ExternalProject: Move more internal commands out of main file
The commands moved to shared_internal_commands.cmake
will soon be used directly by FetchContent, which cannot
always include the full ExternalProject.cmake file (e.g. it may
be used in CMake script mode).
Issue: #21703
Diffstat (limited to 'Tests/RunCMake')
7 files changed, 11 insertions, 11 deletions
diff --git a/Tests/RunCMake/CMP0135/CMP0135-WARN-stderr.txt b/Tests/RunCMake/CMP0135/CMP0135-WARN-stderr.txt index 6bf944e..1632d63 100644 --- a/Tests/RunCMake/CMP0135/CMP0135-WARN-stderr.txt +++ b/Tests/RunCMake/CMP0135/CMP0135-WARN-stderr.txt @@ -1,4 +1,4 @@ -CMake Warning \(dev\) at .*/Modules/ExternalProject.cmake:[0-9]+ \(message\): +CMake Warning \(dev\) at .*/Modules/ExternalProject/shared_internal_commands\.cmake:[0-9]+ \(message\): The DOWNLOAD_EXTRACT_TIMESTAMP option was not given and policy CMP0135 is not set\. The policy's OLD behavior will be used\. When using a URL download, the timestamps of extracted files should preferably be that of @@ -9,7 +9,7 @@ CMake Warning \(dev\) at .*/Modules/ExternalProject.cmake:[0-9]+ \(message\): DOWNLOAD_EXTRACT_TIMESTAMP option with a value of true to avoid this robustness issue\. .* -CMake Warning \(dev\) at .*/Modules/FetchContent.cmake:[0-9]+ \(message\): +CMake Warning \(dev\) at .*/Modules/FetchContent\.cmake:[0-9]+ \(message\): The DOWNLOAD_EXTRACT_TIMESTAMP option was not given and policy CMP0135 is not set\. The policy's OLD behavior will be used\. When using a URL download, the timestamps of extracted files should preferably be that of diff --git a/Tests/RunCMake/ExternalProject/NoOptions-stderr.txt b/Tests/RunCMake/ExternalProject/NoOptions-stderr.txt index 2fc7d29..72c4b81 100644 --- a/Tests/RunCMake/ExternalProject/NoOptions-stderr.txt +++ b/Tests/RunCMake/ExternalProject/NoOptions-stderr.txt @@ -1,4 +1,4 @@ -^CMake Error at .*/Modules/ExternalProject.cmake:[0-9]+ \(message\): +^CMake Error at .*/Modules/ExternalProject/shared_internal_commands\.cmake:[0-9]+ \(message\): No download info given for 'MyProj' and its source directory: .*/Tests/RunCMake/ExternalProject/NoOptions-build/MyProj-prefix/src/MyProj diff --git a/Tests/RunCMake/ExternalProject/SourceEmpty-stderr.txt b/Tests/RunCMake/ExternalProject/SourceEmpty-stderr.txt index 07c6e87..8789dde 100644 --- a/Tests/RunCMake/ExternalProject/SourceEmpty-stderr.txt +++ b/Tests/RunCMake/ExternalProject/SourceEmpty-stderr.txt @@ -1,4 +1,4 @@ -^CMake Error at .*/Modules/ExternalProject.cmake:[0-9]+ \(message\): +^CMake Error at .*/Modules/ExternalProject/shared_internal_commands\.cmake:[0-9]+ \(message\): No download info given for 'MyProj' and its source directory: .*/Tests/RunCMake/ExternalProject/SourceEmpty-build/SourceEmpty diff --git a/Tests/RunCMake/ExternalProject/SourceMissing-stderr.txt b/Tests/RunCMake/ExternalProject/SourceMissing-stderr.txt index 373f6e3..9ff2681 100644 --- a/Tests/RunCMake/ExternalProject/SourceMissing-stderr.txt +++ b/Tests/RunCMake/ExternalProject/SourceMissing-stderr.txt @@ -1,4 +1,4 @@ -^CMake Error at .*/Modules/ExternalProject.cmake:[0-9]+ \(message\): +^CMake Error at .*/Modules/ExternalProject/shared_internal_commands\.cmake:[0-9]+ \(message\): No download info given for 'MyProj' and its source directory: .*/Tests/RunCMake/ExternalProject/SourceMissing-build/SourceMissing diff --git a/Tests/RunCMake/ExternalProject/TLSVersionBadArg-stderr.txt b/Tests/RunCMake/ExternalProject/TLSVersionBadArg-stderr.txt index 1231797..f0973ba 100644 --- a/Tests/RunCMake/ExternalProject/TLSVersionBadArg-stderr.txt +++ b/Tests/RunCMake/ExternalProject/TLSVersionBadArg-stderr.txt @@ -1,9 +1,9 @@ ^CMake Error at [^ -]*/Modules/ExternalProject\.cmake:[0-9]+ \(message\): +]*/Modules/ExternalProject/shared_internal_commands\.cmake:[0-9]+ \(message\): TLS_VERSION 'bad-arg' not known Call Stack \(most recent call first\): [^ -]*/Modules/ExternalProject\.cmake:[0-9]+ \(_ep_get_tls_version\) +]*/Modules/ExternalProject/shared_internal_commands\.cmake:[0-9]+ \(_ep_get_tls_version\) [^ ]*/Modules/ExternalProject\.cmake:[0-9]+ \(_ep_add_download_command\) TLSVersionBadArg\.cmake:[0-9]+ \(ExternalProject_Add\) diff --git a/Tests/RunCMake/ExternalProject/TLSVersionBadEnv-stderr.txt b/Tests/RunCMake/ExternalProject/TLSVersionBadEnv-stderr.txt index 38b0fb8..4069159 100644 --- a/Tests/RunCMake/ExternalProject/TLSVersionBadEnv-stderr.txt +++ b/Tests/RunCMake/ExternalProject/TLSVersionBadEnv-stderr.txt @@ -1,9 +1,9 @@ ^CMake Error at [^ -]*/Modules/ExternalProject\.cmake:[0-9]+ \(message\): +]*/Modules/ExternalProject/shared_internal_commands\.cmake:[0-9]+ \(message\): ENV{CMAKE_TLS_VERSION} 'bad-env' not known Call Stack \(most recent call first\): [^ -]*/Modules/ExternalProject\.cmake:[0-9]+ \(_ep_get_tls_version\) +]*/Modules/ExternalProject/shared_internal_commands\.cmake:[0-9]+ \(_ep_get_tls_version\) [^ ]*/Modules/ExternalProject\.cmake:[0-9]+ \(_ep_add_download_command\) TLSVersionBadEnv\.cmake:[0-9]+ \(ExternalProject_Add\) diff --git a/Tests/RunCMake/ExternalProject/TLSVersionBadVar-stderr.txt b/Tests/RunCMake/ExternalProject/TLSVersionBadVar-stderr.txt index aaec60b..a5f7d64 100644 --- a/Tests/RunCMake/ExternalProject/TLSVersionBadVar-stderr.txt +++ b/Tests/RunCMake/ExternalProject/TLSVersionBadVar-stderr.txt @@ -1,9 +1,9 @@ ^CMake Error at [^ -]*/Modules/ExternalProject\.cmake:[0-9]+ \(message\): +]*/Modules/ExternalProject/shared_internal_commands\.cmake:[0-9]+ \(message\): CMAKE_TLS_VERSION 'bad-var' not known Call Stack \(most recent call first\): [^ -]*/Modules/ExternalProject\.cmake:[0-9]+ \(_ep_get_tls_version\) +]*/Modules/ExternalProject/shared_internal_commands\.cmake:[0-9]+ \(_ep_get_tls_version\) [^ ]*/Modules/ExternalProject\.cmake:[0-9]+ \(_ep_add_download_command\) TLSVersionBadVar\.cmake:[0-9]+ \(ExternalProject_Add\) |