diff options
author | Brad King <brad.king@kitware.com> | 2020-06-16 11:02:53 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-06-16 11:17:55 -0400 |
commit | 9ae33828553597c22a71ad64938a7a4d66d4ebc7 (patch) | |
tree | a92d2644cf9f8b1a85126abf5050acbdb472168c /Tests | |
parent | 248d0570c9016392feb841ffce6ac77e194aefe8 (diff) | |
download | cmake-9ae33828553597c22a71ad64938a7a4d66d4ebc7.tar.gz |
Tests: Shorten case names in RunCMake.file-GET_RUNTIME_DEPENDENCIES test
Now that these cases are in a dedicated test we can drop the
`file-GET_RUNTIME_DEPENDENCIES-` prefix from their name.
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake | 46 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs1-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs1-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs1-stderr.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs1-stderr.txt) | 4 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs1.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs1.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs2-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs2-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs2-stderr.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs2-stderr.txt) | 4 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs2.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs2.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict-all-stderr.txt | 7 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile-all-stderr.txt | 5 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-all-check.cmake | 157 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict-all-stderr.txt | 7 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-notfile-all-stderr.txt | 5 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict-all-stderr.txt | 7 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-notfile-all-stderr.txt | 5 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-all-check.cmake) | 16 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-stderr.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-all-stderr.txt) | 24 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict-all-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict-all-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict-all-stderr.txt | 7 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile-all-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile-all-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile-all-stderr.txt | 5 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-unresolved-all-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-unresolved-all-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-unresolved-all-stderr.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-unresolved-all-stderr.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-unresolved.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-unresolved.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux.cmake) | 6 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux/topexe.c (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux/topexe.c) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux/toplib.c (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux/toplib.c) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-all-check.cmake | 157 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict-all-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict-all-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict-all-stderr.txt | 7 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-notfile-all-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-notfile-all-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-notfile-all-stderr.txt | 5 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-notfile.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-notfile.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-unresolved-all-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-unresolved-all-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-unresolved-all-stderr.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-unresolved-all-stderr.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-unresolved.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-unresolved.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos.cmake) | 6 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos/topexe.c (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos/topexe.c) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos/toplib.c (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos/toplib.c) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/project-stderr.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-project-stderr.txt) | 2 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/project.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-project.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/unsupported-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-unsupported-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/unsupported-stderr.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-unsupported-stderr.txt) | 2 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/unsupported.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-unsupported.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-all-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-all-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-all-stderr.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-all-stderr.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-dev-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-dev-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-dev-stderr.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-dev-stderr.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-all-check.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-all-check.cmake) | 8 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict-all-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict-all-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict-all-stderr.txt | 7 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-notfile-all-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-notfile-all-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-notfile-all-stderr.txt | 5 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-notfile.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-notfile.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-unresolved-all-result.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-unresolved-all-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-unresolved-all-stderr.txt (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-unresolved-all-stderr.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-unresolved.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-unresolved.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows.cmake (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows.cmake) | 6 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows/topexe.c (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows/topexe.c) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows/toplib.c (renamed from Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows/toplib.c) | 0 |
64 files changed, 255 insertions, 255 deletions
diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake index da5069c246..763d57ce3e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake @@ -16,22 +16,22 @@ endfunction() if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") if(NOT CMake_INSTALL_NAME_TOOL_BUG) - run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos) - run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-unresolved) - run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-conflict) - run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-notfile) + run_install_test(macos) + run_install_test(macos-unresolved) + run_install_test(macos-conflict) + run_install_test(macos-notfile) endif() - run_cmake(file-GET_RUNTIME_DEPENDENCIES-project) - run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs1) - run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs2) + run_cmake(project) + run_cmake(badargs1) + run_cmake(badargs2) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - run_install_test(file-GET_RUNTIME_DEPENDENCIES-windows) - run_install_test(file-GET_RUNTIME_DEPENDENCIES-windows-unresolved) - run_install_test(file-GET_RUNTIME_DEPENDENCIES-windows-conflict) - run_install_test(file-GET_RUNTIME_DEPENDENCIES-windows-notfile) - run_cmake(file-GET_RUNTIME_DEPENDENCIES-project) - run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs1) - run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs2) + run_install_test(windows) + run_install_test(windows-unresolved) + run_install_test(windows-conflict) + run_install_test(windows-notfile) + run_cmake(project) + run_cmake(badargs1) + run_cmake(badargs2) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") if(DEFINED ENV{LDFLAGS}) # Some setups prebake disable-new-dtags into LDFLAGS @@ -40,16 +40,16 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") endif() if(NOT CMAKE_C_COMPILER_ID MATCHES "^XL") - run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux) + run_install_test(linux) endif() - run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux-unresolved) - run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux-conflict) - run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux-notfile) - run_cmake(file-GET_RUNTIME_DEPENDENCIES-project) - run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs1) - run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs2) + run_install_test(linux-unresolved) + run_install_test(linux-conflict) + run_install_test(linux-notfile) + run_cmake(project) + run_cmake(badargs1) + run_cmake(badargs2) else() - run_cmake(file-GET_RUNTIME_DEPENDENCIES-unsupported) + run_cmake(unsupported) endif() -run_install_test(file-GET_RUNTIME_DEPENDENCIES-variable-propagation) +run_install_test(variable-propagation) diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs1-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs1-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs1-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs1-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs1-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs1-stderr.txt index b66d1fe5b8..087447356a 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs1-stderr.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs1-stderr.txt @@ -1,4 +1,4 @@ -^CMake Warning \(dev\) at file-GET_RUNTIME_DEPENDENCIES-badargs1\.cmake:[0-9]+ \(file\): +^CMake Warning \(dev\) at badargs1\.cmake:[0-9]+ \(file\): You have used file\(GET_RUNTIME_DEPENDENCIES\) in project mode\. This is probably not what you intended to do\. Instead, please consider using it in an install\(CODE\) or install\(SCRIPT\) command\. For example: @@ -12,7 +12,7 @@ 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 at file-GET_RUNTIME_DEPENDENCIES-badargs1\.cmake:[0-9]+ \(file\): +CMake Error at badargs1\.cmake:[0-9]+ \(file\): file Unrecognized argument: "invalid" Call Stack \(most recent call first\): CMakeLists\.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs1.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs1.cmake index f3b8ce472c..f3b8ce472c 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs1.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs1.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs2-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs2-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs2-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs2-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs2-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs2-stderr.txt index 50fa81fa1a..c6ad3d090d 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs2-stderr.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs2-stderr.txt @@ -1,4 +1,4 @@ -^CMake Warning \(dev\) at file-GET_RUNTIME_DEPENDENCIES-badargs2\.cmake:[0-9]+ \(file\): +^CMake Warning \(dev\) at badargs2\.cmake:[0-9]+ \(file\): You have used file\(GET_RUNTIME_DEPENDENCIES\) in project mode\. This is probably not what you intended to do\. Instead, please consider using it in an install\(CODE\) or install\(SCRIPT\) command\. For example: @@ -12,7 +12,7 @@ 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 at file-GET_RUNTIME_DEPENDENCIES-badargs2\.cmake:[0-9]+ \(file\): +CMake Error at badargs2\.cmake:[0-9]+ \(file\): file Keywords missing values: RESOLVED_DEPENDENCIES_VAR diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs2.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs2.cmake index ac6af85760..ac6af85760 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-badargs2.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/badargs2.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict-all-stderr.txt deleted file mode 100644 index 37f283af48..0000000000 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict-all-stderr.txt +++ /dev/null @@ -1,7 +0,0 @@ -^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): - file Multiple conflicting paths found for librpath\.so: - - [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict-build/root-all/lib/rpath1/librpath\.so - [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict-build/root-all/lib/rpath2/librpath\.so$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile-all-stderr.txt deleted file mode 100644 index 4e56787d66..0000000000 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile-all-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): - file Failed to run objdump on: - - [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile-build/root-all/bin/\.\./lib/libtest\.so$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-all-check.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-all-check.cmake deleted file mode 100644 index d2f79ed2d5..0000000000 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-all-check.cmake +++ /dev/null @@ -1,157 +0,0 @@ -function(check_contents filename contents_regex) - if(EXISTS "${CMAKE_INSTALL_PREFIX}/${filename}") - file(READ "${CMAKE_INSTALL_PREFIX}/${filename}" contents) - if(NOT contents MATCHES "${contents_regex}") - string(APPEND RunCMake_TEST_FAILED "File contents: - ${contents} -do not match what we expected: - ${contents_regex} -in file: - ${CMAKE_INSTALL_PREFIX}/${filename}\n") - set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE) - endif() - else() - string(APPEND RunCMake_TEST_FAILED "File ${CMAKE_INSTALL_PREFIX}/${filename} does not exist") - set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE) - endif() -endfunction() - -set(_check - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/bin/../lib/executable_path/libexecutable_path\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/bin/../lib/rpath_executable_path/librpath_executable_path\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/libtestlib\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/libnormal\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] - [[/usr/lib/libSystem\.B\.dylib]] - ) -check_contents(deps/deps1.txt "^${_check}$") - -set(_check - [[@executable_path/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] - [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] - [[@rpath/librpath_executable_path_bundle\.dylib]] - [[@rpath/librpath_loader_path_unresolved\.dylib]] - [[@rpath/librpath_unresolved\.dylib]] - ) -check_contents(deps/udeps1.txt "^${_check}$") - -set(_check - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/libtestlib\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/libnormal\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] - [[/usr/lib/libSystem\.B\.dylib]] - ) -check_contents(deps/deps2.txt "^${_check}$") - -set(_check - [[@executable_path/../lib/executable_path/libexecutable_path\.dylib]] - [[@executable_path/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] - [[@executable_path/../lib/executable_path_postexcluded/libexecutable_path_postexcluded\.dylib]] - [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] - [[@rpath/librpath_executable_path\.dylib]] - [[@rpath/librpath_executable_path_bundle\.dylib]] - [[@rpath/librpath_executable_path_postexcluded\.dylib]] - [[@rpath/librpath_loader_path_unresolved\.dylib]] - [[@rpath/librpath_unresolved\.dylib]] - ) -check_contents(deps/udeps2.txt "^${_check}$") - -set(_check - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/libtestlib\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/libnormal\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] - [[/usr/lib/libSystem\.B\.dylib]] - ) -check_contents(deps/deps3.txt "^${_check}$") - -set(_check - [[@executable_path/../lib/executable_path/libexecutable_path\.dylib]] - [[@executable_path/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] - [[@executable_path/../lib/executable_path_postexcluded/libexecutable_path_postexcluded\.dylib]] - [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] - [[@rpath/librpath_executable_path\.dylib]] - [[@rpath/librpath_executable_path_bundle\.dylib]] - [[@rpath/librpath_executable_path_postexcluded\.dylib]] - [[@rpath/librpath_loader_path_unresolved\.dylib]] - [[@rpath/librpath_unresolved\.dylib]] - ) -check_contents(deps/udeps3.txt "^${_check}$") - -set(_check - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/bin/../lib/executable_path/libexecutable_path\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/bin/../lib/rpath_executable_path/librpath_executable_path\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/libtestlib\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/libnormal\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] - [[/usr/lib/libSystem\.B\.dylib]] - ) -check_contents(deps/deps4.txt "^${_check}$") - -set(_check - [[@executable_path/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] - [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] - [[@rpath/librpath_executable_path_bundle\.dylib]] - [[@rpath/librpath_loader_path_unresolved\.dylib]] - [[@rpath/librpath_unresolved\.dylib]] - ) -check_contents(deps/udeps4.txt "^${_check}$") - -set(_check - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/bundle_executable/bin/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/libtestlib\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/libnormal\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] - [[/usr/lib/libSystem\.B\.dylib]] - ) -check_contents(deps/deps5.txt "^${_check}$") - -set(_check - [[@executable_path/../lib/executable_path/libexecutable_path\.dylib]] - [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] - [[@rpath/librpath_executable_path\.dylib]] - [[@rpath/librpath_executable_path_bundle\.dylib]] - [[@rpath/librpath_loader_path_unresolved\.dylib]] - [[@rpath/librpath_unresolved\.dylib]] - ) -check_contents(deps/udeps5.txt "^${_check}$") - -set(_check - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/bundle_executable/bin/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/libtestlib\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/normal/libnormal\.dylib]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] - [[/usr/lib/libSystem\.B\.dylib]] - ) -check_contents(deps/deps6.txt "^${_check}$") - -set(_check - [[@executable_path/../lib/executable_path/libexecutable_path\.dylib]] - [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] - [[@rpath/librpath_executable_path\.dylib]] - [[@rpath/librpath_executable_path_bundle\.dylib]] - [[@rpath/librpath_loader_path_unresolved\.dylib]] - [[@rpath/librpath_unresolved\.dylib]] - ) -check_contents(deps/udeps6.txt "^${_check}$") - -set(_check - "^libconflict\\.dylib:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/conflict/libconflict\\.dylib;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-build/root-all/executable/lib/conflict2/libconflict\\.dylib\n$" - ) -check_contents(deps/cdeps1.txt "${_check}") -check_contents(deps/cdeps2.txt "${_check}") -check_contents(deps/cdeps3.txt "${_check}") -check_contents(deps/cdeps4.txt "${_check}") -check_contents(deps/cdeps5.txt "${_check}") -check_contents(deps/cdeps6.txt "${_check}") diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict-all-stderr.txt deleted file mode 100644 index 7f36f7163c..0000000000 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict-all-stderr.txt +++ /dev/null @@ -1,7 +0,0 @@ -^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): - file Multiple conflicting paths found for librpath\.dylib: - - [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict-build/root-all/lib/rpath1/librpath\.dylib - [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict-build/root-all/lib/rpath2/librpath\.dylib$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-notfile-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-notfile-all-stderr.txt deleted file mode 100644 index 1aac009afa..0000000000 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-notfile-all-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): - file Failed to run otool on: - - [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-notfile-build/root-all/bin/\.\./lib/libtest\.dylib$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict-all-stderr.txt deleted file mode 100644 index a9ca6d0f13..0000000000 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict-all-stderr.txt +++ /dev/null @@ -1,7 +0,0 @@ -^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): - file Multiple conflicting paths found for (lib)?path\.dll: - - [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict-build/root-all/lib/test1/(lib)?path\.dll - [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict-build/root-all/lib/test2/(lib)?path\.dll$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-notfile-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-notfile-all-stderr.txt deleted file mode 100644 index 432ac3291d..0000000000 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-notfile-all-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): - file Failed to run (dumpbin|objdump) on: - - [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-notfile-build/root-all/bin/(lib)?test\.dll$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-all-check.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake index ab482f2cbc..381b60291b 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-all-check.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake @@ -17,13 +17,13 @@ in file: endfunction() set(_check - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/libtest_rpath\.so]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/libtest_runpath\.so]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath/librpath\.so]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_parent/librpath_parent\.so]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search/librpath_search\.so]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath/librunpath\.so]] - [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search/librunpath_search\.so]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/libtest_rpath\.so]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/libtest_runpath\.so]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath/librpath\.so]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_parent/librpath_parent\.so]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search/librpath_search\.so]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath/librunpath\.so]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search/librunpath_search\.so]] ) check_contents(deps/deps1.txt "^${_check}$") check_contents(deps/deps2.txt "^${_check}$") @@ -37,7 +37,7 @@ check_contents(deps/udeps1.txt "^${_check}$") check_contents(deps/udeps2.txt "^${_check}$") check_contents(deps/udeps3.txt "^${_check}$") set(_check - "^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/conflict2/libconflict\\.so\n$" + "^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$" ) check_contents(deps/cdeps1.txt "${_check}") check_contents(deps/cdeps2.txt "${_check}") diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-stderr.txt index 7ba30332ef..aeb57361f5 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-all-stderr.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-stderr.txt @@ -2,7 +2,7 @@ Dependency librpath_search_postexcluded\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search_postexcluded +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search_postexcluded See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): @@ -12,7 +12,7 @@ Call Stack \(most recent call first\): Dependency librpath_search\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): @@ -22,7 +22,7 @@ Call Stack \(most recent call first\): Dependency librunpath_search_postexcluded\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search_postexcluded +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search_postexcluded See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): @@ -32,7 +32,7 @@ Call Stack \(most recent call first\): Dependency librunpath_search\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): @@ -42,7 +42,7 @@ Call Stack \(most recent call first\): Dependency librpath_search_postexcluded\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search_postexcluded +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search_postexcluded See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): @@ -52,7 +52,7 @@ Call Stack \(most recent call first\): Dependency librpath_search\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): @@ -62,7 +62,7 @@ Call Stack \(most recent call first\): Dependency librunpath_search_postexcluded\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search_postexcluded +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search_postexcluded See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): @@ -72,7 +72,7 @@ Call Stack \(most recent call first\): Dependency librunpath_search\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): @@ -82,7 +82,7 @@ Call Stack \(most recent call first\): Dependency librpath_search_postexcluded\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search_postexcluded +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search_postexcluded See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): @@ -92,7 +92,7 @@ Call Stack \(most recent call first\): Dependency librpath_search\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): @@ -102,7 +102,7 @@ Call Stack \(most recent call first\): Dependency librunpath_search_postexcluded\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search_postexcluded +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search_postexcluded See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): @@ -112,7 +112,7 @@ Call Stack \(most recent call first\): Dependency librunpath_search\.so found in search directory: [^ -]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\. Call Stack \(most recent call first\): diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict-all-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict-all-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict-all-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict-all-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict-all-stderr.txt new file mode 100644 index 0000000000..a6b65df53e --- /dev/null +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict-all-stderr.txt @@ -0,0 +1,7 @@ +^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): + file Multiple conflicting paths found for librpath\.so: + + [^ +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict-build/root-all/lib/rpath1/librpath\.so + [^ +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict-build/root-all/lib/rpath2/librpath\.so$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict.cmake index f7194995d8..f7194995d8 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile-all-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile-all-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile-all-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile-all-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile-all-stderr.txt new file mode 100644 index 0000000000..d9758c579e --- /dev/null +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile-all-stderr.txt @@ -0,0 +1,5 @@ +^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): + file Failed to run objdump on: + + [^ +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile-build/root-all/bin/\.\./lib/libtest\.so$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile.cmake index 6567438a27..6567438a27 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-unresolved-all-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-unresolved-all-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-unresolved-all-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-unresolved-all-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-unresolved-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-unresolved-all-stderr.txt index eaca5121b8..eaca5121b8 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-unresolved-all-stderr.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-unresolved-all-stderr.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-unresolved.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-unresolved.cmake index 3efa305be7..3efa305be7 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-unresolved.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-unresolved.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux.cmake index bd0f9f1694..d82d8fbb56 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux.cmake @@ -98,9 +98,9 @@ target_link_options(test_runpath PRIVATE -Wl,--enable-new-dtags) set_property(TARGET test_rpath ${test_rpath_names} test_runpath ${test_runpath_names} PROPERTY LIBRARY_OUTPUT_DIRECTORY lib) install(TARGETS test_rpath test_runpath DESTINATION lib) -add_executable(topexe file-GET_RUNTIME_DEPENDENCIES-linux/topexe.c) -add_library(toplib SHARED file-GET_RUNTIME_DEPENDENCIES-linux/toplib.c) -add_library(topmod MODULE file-GET_RUNTIME_DEPENDENCIES-linux/toplib.c) +add_executable(topexe linux/topexe.c) +add_library(toplib SHARED linux/toplib.c) +add_library(topmod MODULE linux/toplib.c) target_link_libraries(topexe PRIVATE test_rpath test_runpath) target_link_libraries(toplib PRIVATE test_rpath test_runpath) target_link_libraries(topmod PRIVATE test_rpath test_runpath) diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux/topexe.c b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux/topexe.c index d196afe0d6..d196afe0d6 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux/topexe.c +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux/topexe.c diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux/toplib.c b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux/toplib.c index 040e591910..040e591910 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux/toplib.c +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux/toplib.c diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-all-check.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-all-check.cmake new file mode 100644 index 0000000000..7f68398310 --- /dev/null +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-all-check.cmake @@ -0,0 +1,157 @@ +function(check_contents filename contents_regex) + if(EXISTS "${CMAKE_INSTALL_PREFIX}/${filename}") + file(READ "${CMAKE_INSTALL_PREFIX}/${filename}" contents) + if(NOT contents MATCHES "${contents_regex}") + string(APPEND RunCMake_TEST_FAILED "File contents: + ${contents} +do not match what we expected: + ${contents_regex} +in file: + ${CMAKE_INSTALL_PREFIX}/${filename}\n") + set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE) + endif() + else() + string(APPEND RunCMake_TEST_FAILED "File ${CMAKE_INSTALL_PREFIX}/${filename} does not exist") + set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE) + endif() +endfunction() + +set(_check + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/bin/../lib/executable_path/libexecutable_path\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/bin/../lib/rpath_executable_path/librpath_executable_path\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/libtestlib\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/libnormal\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] + [[/usr/lib/libSystem\.B\.dylib]] + ) +check_contents(deps/deps1.txt "^${_check}$") + +set(_check + [[@executable_path/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] + [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] + [[@rpath/librpath_executable_path_bundle\.dylib]] + [[@rpath/librpath_loader_path_unresolved\.dylib]] + [[@rpath/librpath_unresolved\.dylib]] + ) +check_contents(deps/udeps1.txt "^${_check}$") + +set(_check + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/libtestlib\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/libnormal\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] + [[/usr/lib/libSystem\.B\.dylib]] + ) +check_contents(deps/deps2.txt "^${_check}$") + +set(_check + [[@executable_path/../lib/executable_path/libexecutable_path\.dylib]] + [[@executable_path/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] + [[@executable_path/../lib/executable_path_postexcluded/libexecutable_path_postexcluded\.dylib]] + [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] + [[@rpath/librpath_executable_path\.dylib]] + [[@rpath/librpath_executable_path_bundle\.dylib]] + [[@rpath/librpath_executable_path_postexcluded\.dylib]] + [[@rpath/librpath_loader_path_unresolved\.dylib]] + [[@rpath/librpath_unresolved\.dylib]] + ) +check_contents(deps/udeps2.txt "^${_check}$") + +set(_check + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/libtestlib\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/libnormal\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] + [[/usr/lib/libSystem\.B\.dylib]] + ) +check_contents(deps/deps3.txt "^${_check}$") + +set(_check + [[@executable_path/../lib/executable_path/libexecutable_path\.dylib]] + [[@executable_path/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] + [[@executable_path/../lib/executable_path_postexcluded/libexecutable_path_postexcluded\.dylib]] + [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] + [[@rpath/librpath_executable_path\.dylib]] + [[@rpath/librpath_executable_path_bundle\.dylib]] + [[@rpath/librpath_executable_path_postexcluded\.dylib]] + [[@rpath/librpath_loader_path_unresolved\.dylib]] + [[@rpath/librpath_unresolved\.dylib]] + ) +check_contents(deps/udeps3.txt "^${_check}$") + +set(_check + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/bin/../lib/executable_path/libexecutable_path\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/bin/../lib/rpath_executable_path/librpath_executable_path\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/libtestlib\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/libnormal\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] + [[/usr/lib/libSystem\.B\.dylib]] + ) +check_contents(deps/deps4.txt "^${_check}$") + +set(_check + [[@executable_path/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] + [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] + [[@rpath/librpath_executable_path_bundle\.dylib]] + [[@rpath/librpath_loader_path_unresolved\.dylib]] + [[@rpath/librpath_unresolved\.dylib]] + ) +check_contents(deps/udeps4.txt "^${_check}$") + +set(_check + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/bundle_executable/bin/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/libtestlib\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/libnormal\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] + [[/usr/lib/libSystem\.B\.dylib]] + ) +check_contents(deps/deps5.txt "^${_check}$") + +set(_check + [[@executable_path/../lib/executable_path/libexecutable_path\.dylib]] + [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] + [[@rpath/librpath_executable_path\.dylib]] + [[@rpath/librpath_executable_path_bundle\.dylib]] + [[@rpath/librpath_loader_path_unresolved\.dylib]] + [[@rpath/librpath_unresolved\.dylib]] + ) +check_contents(deps/udeps5.txt "^${_check}$") + +set(_check + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/bundle_executable/bin/../lib/executable_path_bundle/libexecutable_path_bundle\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/libtestlib\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/loader_path/libloader_path\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/../rpath/librpath\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/normal/libnormal\.dylib]] + [[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/rpath_loader_path/librpath_loader_path\.dylib]] + [[/usr/lib/libSystem\.B\.dylib]] + ) +check_contents(deps/deps6.txt "^${_check}$") + +set(_check + [[@executable_path/../lib/executable_path/libexecutable_path\.dylib]] + [[@loader_path/loader_path_unresolved/libloader_path_unresolved\.dylib]] + [[@rpath/librpath_executable_path\.dylib]] + [[@rpath/librpath_executable_path_bundle\.dylib]] + [[@rpath/librpath_loader_path_unresolved\.dylib]] + [[@rpath/librpath_unresolved\.dylib]] + ) +check_contents(deps/udeps6.txt "^${_check}$") + +set(_check + "^libconflict\\.dylib:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/conflict/libconflict\\.dylib;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-build/root-all/executable/lib/conflict2/libconflict\\.dylib\n$" + ) +check_contents(deps/cdeps1.txt "${_check}") +check_contents(deps/cdeps2.txt "${_check}") +check_contents(deps/cdeps3.txt "${_check}") +check_contents(deps/cdeps4.txt "${_check}") +check_contents(deps/cdeps5.txt "${_check}") +check_contents(deps/cdeps6.txt "${_check}") diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict-all-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict-all-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict-all-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict-all-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict-all-stderr.txt new file mode 100644 index 0000000000..d8323a8a0a --- /dev/null +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict-all-stderr.txt @@ -0,0 +1,7 @@ +^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): + file Multiple conflicting paths found for librpath\.dylib: + + [^ +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict-build/root-all/lib/rpath1/librpath\.dylib + [^ +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict-build/root-all/lib/rpath2/librpath\.dylib$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict.cmake index a8446fe2dd..a8446fe2dd 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-conflict.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-conflict.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-notfile-all-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-notfile-all-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-notfile-all-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-notfile-all-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-notfile-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-notfile-all-stderr.txt new file mode 100644 index 0000000000..1afc1b106a --- /dev/null +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-notfile-all-stderr.txt @@ -0,0 +1,5 @@ +^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): + file Failed to run otool on: + + [^ +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-notfile-build/root-all/bin/\.\./lib/libtest\.dylib$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-notfile.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-notfile.cmake index 3e4c43423f..3e4c43423f 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-notfile.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-notfile.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-unresolved-all-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-unresolved-all-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-unresolved-all-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-unresolved-all-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-unresolved-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-unresolved-all-stderr.txt index 01762b45f5..01762b45f5 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-unresolved-all-stderr.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-unresolved-all-stderr.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-unresolved.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-unresolved.cmake index c9b6c95595..c9b6c95595 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos-unresolved.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos-unresolved.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos.cmake index 6db05b3fff..c56a14b6ca 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos.cmake @@ -127,9 +127,9 @@ endforeach() target_link_libraries(testlib PRIVATE ${testlib_names}) -add_executable(topexe file-GET_RUNTIME_DEPENDENCIES-macos/topexe.c) -add_library(toplib SHARED file-GET_RUNTIME_DEPENDENCIES-macos/toplib.c) -add_library(topmod MODULE file-GET_RUNTIME_DEPENDENCIES-macos/toplib.c) +add_executable(topexe macos/topexe.c) +add_library(toplib SHARED macos/toplib.c) +add_library(topmod MODULE macos/toplib.c) target_link_libraries(topexe PRIVATE testlib) target_link_libraries(toplib PRIVATE testlib) target_link_libraries(topmod PRIVATE testlib) diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos/topexe.c b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos/topexe.c index 20c6087318..20c6087318 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos/topexe.c +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos/topexe.c diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos/toplib.c b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos/toplib.c index cff1bff3f3..cff1bff3f3 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-macos/toplib.c +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/macos/toplib.c diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-project-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/project-stderr.txt index d506645a0c..f14a10dcb1 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-project-stderr.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/project-stderr.txt @@ -1,4 +1,4 @@ -^CMake Warning \(dev\) at file-GET_RUNTIME_DEPENDENCIES-project\.cmake:[0-9]+ \(file\): +^CMake Warning \(dev\) at project\.cmake:[0-9]+ \(file\): You have used file\(GET_RUNTIME_DEPENDENCIES\) in project mode\. This is probably not what you intended to do\. Instead, please consider using it in an install\(CODE\) or install\(SCRIPT\) command\. For example: diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-project.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/project.cmake index 842d7abd70..842d7abd70 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-project.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/project.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-unsupported-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/unsupported-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-unsupported-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/unsupported-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-unsupported-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/unsupported-stderr.txt index 3db835c081..000159f0be 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-unsupported-stderr.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/unsupported-stderr.txt @@ -1,4 +1,4 @@ -^CMake Error at file-GET_RUNTIME_DEPENDENCIES-unsupported\.cmake:[0-9]+ \(file\): +^CMake Error at unsupported\.cmake:[0-9]+ \(file\): file GET_RUNTIME_DEPENDENCIES is not supported on system "[^ ]+" Call Stack \(most recent call first\): diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-unsupported.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/unsupported.cmake index b91eefef37..b91eefef37 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-unsupported.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/unsupported.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-all-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-all-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-all-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-all-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-all-stderr.txt index 591a5e7ab5..591a5e7ab5 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-all-stderr.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-all-stderr.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-dev-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-dev-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-dev-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-dev-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-dev-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-dev-stderr.txt index 591a5e7ab5..591a5e7ab5 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation-dev-stderr.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation-dev-stderr.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation.cmake index 07bbc5ec4c..07bbc5ec4c 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-variable-propagation.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/variable-propagation.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-all-check.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-all-check.cmake index b1ba6dfa9f..f1d70a1099 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-all-check.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-all-check.cmake @@ -17,9 +17,9 @@ in file: endfunction() set(_check - [=[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-build/root-all/bin/\.conflict/\.\./(lib)?libdir\.dll]=] - [=[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-build/root-all/bin/\.search/(lib)?search\.dll]=] - [=[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-build/root-all/bin/(lib)?testlib\.dll]=] + [=[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-build/root-all/bin/\.conflict/\.\./(lib)?libdir\.dll]=] + [=[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-build/root-all/bin/\.search/(lib)?search\.dll]=] + [=[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-build/root-all/bin/(lib)?testlib\.dll]=] ) check_contents(deps/deps1.txt "^${_check}$") check_contents(deps/deps2.txt "^${_check}$") @@ -31,7 +31,7 @@ check_contents(deps/udeps1.txt "^${_check}$") check_contents(deps/udeps2.txt "^${_check}$") check_contents(deps/udeps3.txt "^${_check}$") set(_check - "^(lib)?conflict\\.dll:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-build/root-all/bin/\\.conflict/(lib)?conflict\\.dll;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-build/root-all/bin/(lib)?conflict\\.dll\n$" + "^(lib)?conflict\\.dll:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-build/root-all/bin/\\.conflict/(lib)?conflict\\.dll;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-build/root-all/bin/(lib)?conflict\\.dll\n$" ) check_contents(deps/cdeps1.txt "${_check}") check_contents(deps/cdeps2.txt "${_check}") diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict-all-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict-all-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict-all-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict-all-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict-all-stderr.txt new file mode 100644 index 0000000000..c48c55dc24 --- /dev/null +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict-all-stderr.txt @@ -0,0 +1,7 @@ +^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): + file Multiple conflicting paths found for (lib)?path\.dll: + + [^ +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict-build/root-all/lib/test1/(lib)?path\.dll + [^ +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict-build/root-all/lib/test2/(lib)?path\.dll$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict.cmake index d413443759..d413443759 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-conflict.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-conflict.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-notfile-all-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-notfile-all-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-notfile-all-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-notfile-all-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-notfile-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-notfile-all-stderr.txt new file mode 100644 index 0000000000..33c0390c2b --- /dev/null +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-notfile-all-stderr.txt @@ -0,0 +1,5 @@ +^CMake Error at cmake_install\.cmake:[0-9]+ \(file\): + file Failed to run (dumpbin|objdump) on: + + [^ +]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-notfile-build/root-all/bin/(lib)?test\.dll$ diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-notfile.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-notfile.cmake index 6665a3b3e0..6665a3b3e0 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-notfile.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-notfile.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-unresolved-all-result.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-unresolved-all-result.txt index d00491fd7e..d00491fd7e 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-unresolved-all-result.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-unresolved-all-result.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-unresolved-all-stderr.txt b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-unresolved-all-stderr.txt index a20654c5aa..a20654c5aa 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-unresolved-all-stderr.txt +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-unresolved-all-stderr.txt diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-unresolved.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-unresolved.cmake index 4cc74c70db..4cc74c70db 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows-unresolved.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows-unresolved.cmake diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows.cmake index 19288d8531..9160ce5f20 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows.cmake @@ -38,9 +38,9 @@ install(TARGETS testlib libdir_postexcluded libdir conflict testlib_noconflict D install(TARGETS libdir search_postexcluded search DESTINATION bin/.search) # Prefixing with "." ensures it is the first item after list(SORT) install(TARGETS testlib_conflict conflict DESTINATION bin/.conflict) -add_executable(topexe file-GET_RUNTIME_DEPENDENCIES-windows/topexe.c) -add_library(toplib SHARED file-GET_RUNTIME_DEPENDENCIES-windows/toplib.c) -add_library(topmod MODULE file-GET_RUNTIME_DEPENDENCIES-windows/toplib.c) +add_executable(topexe windows/topexe.c) +add_library(toplib SHARED windows/toplib.c) +add_library(topmod MODULE windows/toplib.c) target_link_libraries(topexe PRIVATE testlib) target_link_libraries(toplib PRIVATE testlib) target_link_libraries(topmod PRIVATE testlib) diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows/topexe.c b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows/topexe.c index 713b8eb417..713b8eb417 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows/topexe.c +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows/topexe.c diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows/toplib.c b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows/toplib.c index 69971759e5..69971759e5 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-windows/toplib.c +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/windows/toplib.c |