diff options
author | Nils Gladitz <nilsgladitz@gmail.com> | 2015-04-29 13:09:24 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-04-30 14:20:20 (GMT) |
commit | 32a2f41402d38e1c5be3547bd042328df0b28124 (patch) | |
tree | 9991861d5cc2a0966ad3ac1976a3c3d73081b463 /Tests | |
parent | d1a74bba1bba0c4381e7c3a6a93551320dc377ac (diff) | |
download | CMake-32a2f41402d38e1c5be3547bd042328df0b28124.zip CMake-32a2f41402d38e1c5be3547bd042328df0b28124.tar.gz CMake-32a2f41402d38e1c5be3547bd042328df0b28124.tar.bz2 |
Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."
This reverts commit 242c3966 (add_custom_command: Diagnose
MAIN_DEPENDENCY limitation, 2015-03-09) and the follow up commit
b372a99a (UseSWIG: Do not use MAIN_DEPENDENCY on custom commands,
2015-03-26).
I misdiagnosed the underlying issue that prompted creation of policy CMP0057.
The actual issue surfaces when a single custom command's MAIN_DEPENDENCY
is listed in more than one target; this issue will have to be addressed
independently.
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/RunCMake/CMP0057/CMP0057-NEW-result.txt | 1 | ||||
-rw-r--r-- | Tests/RunCMake/CMP0057/CMP0057-NEW-stderr.txt | 4 | ||||
-rw-r--r-- | Tests/RunCMake/CMP0057/CMP0057-NEW.cmake | 13 | ||||
-rw-r--r-- | Tests/RunCMake/CMP0057/CMP0057-OLD.cmake | 13 | ||||
-rw-r--r-- | Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt | 9 | ||||
-rw-r--r-- | Tests/RunCMake/CMP0057/CMP0057-WARN.cmake | 11 | ||||
-rw-r--r-- | Tests/RunCMake/CMP0057/CMP0057-once_is_ok.cmake | 8 | ||||
-rw-r--r-- | Tests/RunCMake/CMP0057/CMakeLists.txt | 3 | ||||
-rw-r--r-- | Tests/RunCMake/CMP0057/RunCMakeTest.cmake | 7 | ||||
-rw-r--r-- | Tests/RunCMake/CMP0057/input.txt | 0 | ||||
-rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 1 |
11 files changed, 0 insertions, 70 deletions
diff --git a/Tests/RunCMake/CMP0057/CMP0057-NEW-result.txt b/Tests/RunCMake/CMP0057/CMP0057-NEW-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/CMP0057/CMP0057-NEW-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/CMP0057/CMP0057-NEW-stderr.txt b/Tests/RunCMake/CMP0057/CMP0057-NEW-stderr.txt deleted file mode 100644 index 9607d54..0000000 --- a/Tests/RunCMake/CMP0057/CMP0057-NEW-stderr.txt +++ /dev/null @@ -1,4 +0,0 @@ -CMake Error at CMP0057-NEW.cmake:8 \(add_custom_command\): - "input.txt" can only be specified as a custom command MAIN_DEPENDENCY once. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/CMP0057/CMP0057-NEW.cmake b/Tests/RunCMake/CMP0057/CMP0057-NEW.cmake deleted file mode 100644 index 22dbfb3..0000000 --- a/Tests/RunCMake/CMP0057/CMP0057-NEW.cmake +++ /dev/null @@ -1,13 +0,0 @@ -cmake_policy(SET CMP0057 NEW) - -add_custom_command(OUTPUT out1 - COMMAND ${CMAKE_COMMAND} -E echo out1 - MAIN_DEPENDENCY input.txt -) - -add_custom_command(OUTPUT out2 - COMMAND ${CMAKE_COMMAND} -E echo out2 - MAIN_DEPENDENCY input.txt -) - -add_custom_target(mytarget1 ALL DEPENDS out1 out2) diff --git a/Tests/RunCMake/CMP0057/CMP0057-OLD.cmake b/Tests/RunCMake/CMP0057/CMP0057-OLD.cmake deleted file mode 100644 index ccf4fcb..0000000 --- a/Tests/RunCMake/CMP0057/CMP0057-OLD.cmake +++ /dev/null @@ -1,13 +0,0 @@ -cmake_policy(SET CMP0057 OLD) - -add_custom_command(OUTPUT out1 - COMMAND ${CMAKE_COMMAND} -E echo out1 - MAIN_DEPENDENCY input.txt -) - -add_custom_command(OUTPUT out2 - COMMAND ${CMAKE_COMMAND} -E echo out2 - MAIN_DEPENDENCY input.txt -) - -add_custom_target(mytarget1 ALL DEPENDS out1 out2) diff --git a/Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt b/Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt deleted file mode 100644 index da3a1cb..0000000 --- a/Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt +++ /dev/null @@ -1,9 +0,0 @@ -CMake Warning \(dev\) at CMP0057-WARN.cmake:6 \(add_custom_command\): - Policy CMP0057 is not set: Disallow multiple MAIN_DEPENDENCY specifications - for the same file. Run "cmake --help-policy CMP0057" for policy details. - Use the cmake_policy command to set the policy and suppress this warning. - - "input.txt" can only be specified as a custom command MAIN_DEPENDENCY once. -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/CMP0057/CMP0057-WARN.cmake b/Tests/RunCMake/CMP0057/CMP0057-WARN.cmake deleted file mode 100644 index 1837968..0000000 --- a/Tests/RunCMake/CMP0057/CMP0057-WARN.cmake +++ /dev/null @@ -1,11 +0,0 @@ -add_custom_command(OUTPUT out1 - COMMAND ${CMAKE_COMMAND} -E echo out1 - MAIN_DEPENDENCY input.txt -) - -add_custom_command(OUTPUT out2 - COMMAND ${CMAKE_COMMAND} -E echo out2 - MAIN_DEPENDENCY input.txt -) - -add_custom_target(mytarget1 ALL DEPENDS out1 out2) diff --git a/Tests/RunCMake/CMP0057/CMP0057-once_is_ok.cmake b/Tests/RunCMake/CMP0057/CMP0057-once_is_ok.cmake deleted file mode 100644 index 8ce02f9..0000000 --- a/Tests/RunCMake/CMP0057/CMP0057-once_is_ok.cmake +++ /dev/null @@ -1,8 +0,0 @@ -cmake_policy(SET CMP0057 NEW) - -add_custom_command(OUTPUT out1 - COMMAND ${CMAKE_COMMAND} -E echo out1 - MAIN_DEPENDENCY input.txt -) - -add_custom_target(mytarget1 ALL DEPENDS out1) diff --git a/Tests/RunCMake/CMP0057/CMakeLists.txt b/Tests/RunCMake/CMP0057/CMakeLists.txt deleted file mode 100644 index ef2163c..0000000 --- a/Tests/RunCMake/CMP0057/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(${RunCMake_TEST} NONE) -include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/CMP0057/RunCMakeTest.cmake b/Tests/RunCMake/CMP0057/RunCMakeTest.cmake deleted file mode 100644 index f79235f..0000000 --- a/Tests/RunCMake/CMP0057/RunCMakeTest.cmake +++ /dev/null @@ -1,7 +0,0 @@ -include(RunCMake) - -run_cmake(CMP0057-OLD) -run_cmake(CMP0057-NEW) -run_cmake(CMP0057-WARN) - -run_cmake(CMP0057-once_is_ok) diff --git a/Tests/RunCMake/CMP0057/input.txt b/Tests/RunCMake/CMP0057/input.txt deleted file mode 100644 index e69de29..0000000 --- a/Tests/RunCMake/CMP0057/input.txt +++ /dev/null diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index d5f1d22..dc18764 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -63,7 +63,6 @@ add_RunCMake_test(CMP0051) add_RunCMake_test(CMP0053) add_RunCMake_test(CMP0054) add_RunCMake_test(CMP0055) -add_RunCMake_test(CMP0057) add_RunCMake_test(CMP0059) add_RunCMake_test(CMP0060) if(CMAKE_GENERATOR STREQUAL "Ninja") |