diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-15 09:32:32 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-15 09:32:32 -0400 |
| commit | ebffbda4476aae1e89029f2e24fd76a22765205a (patch) | |
| tree | b03c5806968dd58a35635de71af9ab2323688b75 /Tests | |
| parent | 29b1e591152dc56c03ae2b6d6721d5b1c297505a (diff) | |
| parent | af1f6987571b6f8298b03e184aa4aad23882d5c8 (diff) | |
| download | cmake-ebffbda4476aae1e89029f2e24fd76a22765205a.tar.gz | |
Merge topic 'fix-CMP0024-multiple-directories'
af1f698 CMP0024: Store the fact of included export in global generator.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/include/CMP0024-NEW-stderr.txt | 7 | ||||
| -rw-r--r-- | Tests/RunCMake/include/CMP0024-NEW.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/include/CMP0024-WARN-stderr.txt | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/include/CMP0024-WARN.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/include/subdir1/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/include/subdir2/CMakeLists.txt | 2 |
6 files changed, 12 insertions, 13 deletions
diff --git a/Tests/RunCMake/include/CMP0024-NEW-stderr.txt b/Tests/RunCMake/include/CMP0024-NEW-stderr.txt index 182c67a466..059d7e45ac 100644 --- a/Tests/RunCMake/include/CMP0024-NEW-stderr.txt +++ b/Tests/RunCMake/include/CMP0024-NEW-stderr.txt @@ -1,15 +1,12 @@ -CMake Error at CMP0024-NEW.cmake:9 \(include\): +CMake Error at subdir2/CMakeLists.txt:2 \(include\): Policy CMP0024 is not set: Disallow include export result. Run "cmake --help-policy CMP0024" for policy details. Use the cmake_policy command to set the policy and suppress this warning. The file - .*/Tests/RunCMake/include/CMP0024-NEW-build/theTargets.cmake + .*/Tests/RunCMake/include/CMP0024-NEW-build/subdir1/theTargets.cmake was generated by the export\(\) command. It may not be used as the argument to the include\(\) command. Use ALIAS targets instead to refer to targets by alternative names. - -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/include/CMP0024-NEW.cmake b/Tests/RunCMake/include/CMP0024-NEW.cmake index 0685d6c413..0e03d2af85 100644 --- a/Tests/RunCMake/include/CMP0024-NEW.cmake +++ b/Tests/RunCMake/include/CMP0024-NEW.cmake @@ -5,5 +5,5 @@ cmake_policy(SET CMP0024 NEW) add_library(foo SHARED empty.cpp) -export(TARGETS foo FILE "${CMAKE_CURRENT_BINARY_DIR}/theTargets.cmake") -include("${CMAKE_CURRENT_BINARY_DIR}/theTargets.cmake") +add_subdirectory(subdir1) +add_subdirectory(subdir2) diff --git a/Tests/RunCMake/include/CMP0024-WARN-stderr.txt b/Tests/RunCMake/include/CMP0024-WARN-stderr.txt index 2b36f17316..9c79007058 100644 --- a/Tests/RunCMake/include/CMP0024-WARN-stderr.txt +++ b/Tests/RunCMake/include/CMP0024-WARN-stderr.txt @@ -1,16 +1,14 @@ -CMake Warning \(dev\) at CMP0024-WARN.cmake:7 \(include\): +CMake Warning \(dev\) at subdir2/CMakeLists.txt:2 \(include\): Policy CMP0024 is not set: Disallow include export result. Run "cmake --help-policy CMP0024" for policy details. Use the cmake_policy command to set the policy and suppress this warning. The file - .*/Tests/RunCMake/include/CMP0024-WARN-build/theTargets.cmake + .*/Tests/RunCMake/include/CMP0024-WARN-build/subdir1/theTargets.cmake was generated by the export\(\) command. It should not be used as the argument to the include\(\) command. Use ALIAS targets instead to refer to targets by alternative names. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/include/CMP0024-WARN.cmake b/Tests/RunCMake/include/CMP0024-WARN.cmake index 583c7d426d..783cf78e5d 100644 --- a/Tests/RunCMake/include/CMP0024-WARN.cmake +++ b/Tests/RunCMake/include/CMP0024-WARN.cmake @@ -3,5 +3,5 @@ enable_language(CXX) add_library(foo SHARED empty.cpp) -export(TARGETS foo FILE "${CMAKE_CURRENT_BINARY_DIR}/theTargets.cmake") -include("${CMAKE_CURRENT_BINARY_DIR}/theTargets.cmake") +add_subdirectory(subdir1) +add_subdirectory(subdir2) diff --git a/Tests/RunCMake/include/subdir1/CMakeLists.txt b/Tests/RunCMake/include/subdir1/CMakeLists.txt new file mode 100644 index 0000000000..11a76d1dd3 --- /dev/null +++ b/Tests/RunCMake/include/subdir1/CMakeLists.txt @@ -0,0 +1,2 @@ + +export(TARGETS foo FILE "${CMAKE_CURRENT_BINARY_DIR}/theTargets.cmake") diff --git a/Tests/RunCMake/include/subdir2/CMakeLists.txt b/Tests/RunCMake/include/subdir2/CMakeLists.txt new file mode 100644 index 0000000000..7361f9cb11 --- /dev/null +++ b/Tests/RunCMake/include/subdir2/CMakeLists.txt @@ -0,0 +1,2 @@ + +include("${CMAKE_CURRENT_BINARY_DIR}/../subdir1/theTargets.cmake") |