[Cmake-commits] CMake branch, next, updated. v3.2.2-2350-gbafa7c0
Brad King
brad.king at kitware.com
Thu Apr 30 10:27:39 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via bafa7c0aad1f2368ae2fae4fb00ec232b6b6f179 (commit)
via aed6239e40e7046c3f32e018d9c360ad0f624336 (commit)
via 32a2f41402d38e1c5be3547bd042328df0b28124 (commit)
from ae442cb571fa32b73ddfa60a8b0dc879b1035214 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bafa7c0aad1f2368ae2fae4fb00ec232b6b6f179
commit bafa7c0aad1f2368ae2fae4fb00ec232b6b6f179
Merge: ae442cb aed6239
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 30 10:27:37 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 30 10:27:37 2015 -0400
Merge topic 'if-IN_LIST' into next
aed6239e if: Implement new IN_LIST operator
32a2f414 Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aed6239e40e7046c3f32e018d9c360ad0f624336
commit aed6239e40e7046c3f32e018d9c360ad0f624336
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Apr 29 17:25:13 2015 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 30 10:21:19 2015 -0400
if: Implement new IN_LIST operator
diff --git a/Help/command/if.rst b/Help/command/if.rst
index d50b14c..396becf 100644
--- a/Help/command/if.rst
+++ b/Help/command/if.rst
@@ -134,6 +134,9 @@ Possible expressions are:
Component-wise integer version number comparison (version format is
``major[.minor[.patch[.tweak]]]``).
+``if(<variable|string> IN_LIST <variable>)``
+ True if the given element is contained in the named list variable.
+
``if(DEFINED <variable>)``
True if the given variable is defined. It does not matter if the
variable is true or false just if it has been set. (Note macro
diff --git a/Help/policy/CMP0057.rst b/Help/policy/CMP0057.rst
index 377f22d..1298a16 100644
--- a/Help/policy/CMP0057.rst
+++ b/Help/policy/CMP0057.rst
@@ -1,4 +1,14 @@
CMP0057
-------
-This policy is reserved for future use.
+Support new :command:`if` IN_LIST operator.
+
+CMake 3.3 adds support for the new IN_LIST operator.
+
+The ``OLD`` behavior for this policy is to ignore the IN_LIST operator.
+The ``NEW`` behavior is to interpret the IN_LIST operator.
+
+This policy was introduced in CMake version 3.3.
+CMake version |release| warns when the policy is not set and uses
+``OLD`` behavior. Use the :command:`cmake_policy` command to set
+it to ``OLD`` or ``NEW`` explicitly.
diff --git a/Help/release/dev/if-IN_LIST.rst b/Help/release/dev/if-IN_LIST.rst
new file mode 100644
index 0000000..9dd0725
--- /dev/null
+++ b/Help/release/dev/if-IN_LIST.rst
@@ -0,0 +1,5 @@
+if-IN_LIST
+----------
+
+* Add a new IN_LIST operator to if() that evaluates true
+ if a given element is contained in a named list.
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 0a71c60..1f9b9d4 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -15,7 +15,8 @@
cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile):
Makefile(makefile),
Policy12Status(makefile.GetPolicyStatus(cmPolicies::CMP0012)),
- Policy54Status(makefile.GetPolicyStatus(cmPolicies::CMP0054))
+ Policy54Status(makefile.GetPolicyStatus(cmPolicies::CMP0054)),
+ Policy57Status(makefile.GetPolicyStatus(cmPolicies::CMP0057))
{
}
@@ -676,6 +677,41 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
reducible, arg, newArgs, argP1, argP2);
}
+ if (argP1 != newArgs.end() && argP2 != newArgs.end() &&
+ this->IsKeyword("IN_LIST", *argP1))
+ {
+ if(this->Policy57Status != cmPolicies::OLD &&
+ this->Policy57Status != cmPolicies::WARN)
+ {
+ bool result = false;
+
+ def = this->GetVariableOrString(*arg);
+ def2 = this->Makefile.GetDefinition(argP2->GetValue());
+
+ if(def2)
+ {
+ std::vector<std::string> list;
+ cmSystemTools::ExpandListArgument(def2, list, true);
+
+ result = std::find(list.begin(), list.end(), def) != list.end();
+ }
+
+ this->HandleBinaryOp(result,
+ reducible, arg, newArgs, argP1, argP2);
+ }
+ else if(this->Policy57Status == cmPolicies::WARN)
+ {
+ std::ostringstream e;
+ e << (this->Makefile.GetPolicies()->GetPolicyWarning(
+ cmPolicies::CMP0057)) << "\n";
+ e << "IN_LIST will be interpreted as an operator "
+ "when the policy is set to NEW. "
+ "Since the policy is not set the OLD behavior will be used.";
+
+ this->Makefile.IssueMessage(cmake::AUTHOR_WARNING, e.str());
+ }
+ }
+
++arg;
}
}
diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h
index fcef234..c923d76 100644
--- a/Source/cmConditionEvaluator.h
+++ b/Source/cmConditionEvaluator.h
@@ -93,6 +93,7 @@ private:
cmMakefile& Makefile;
cmPolicies::PolicyStatus Policy12Status;
cmPolicies::PolicyStatus Policy54Status;
+ cmPolicies::PolicyStatus Policy57Status;
};
#endif
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index ab60f93..76990f0 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -390,6 +390,11 @@ cmPolicies::cmPolicies()
CMP0060, "CMP0060",
"Link libraries by full path even in implicit directories.",
3,3,0, cmPolicies::WARN);
+
+ this->DefinePolicy(
+ CMP0057, "CMP0057",
+ "Support new IN_LIST if() operator.",
+ 3,3,0, cmPolicies::WARN);
}
cmPolicies::~cmPolicies()
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 90acf8e..ca82264 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -117,6 +117,7 @@ public:
CMP0059, ///< Do not treat ``DEFINITIONS`` as a built-in directory
/// property.
CMP0060, ///< Link libraries by full path even in implicit directories.
+ CMP0057, ///< Support new IN_LIST if() operator.
/** \brief Always the last entry.
*
diff --git a/Tests/RunCMake/CMP0057/CMP0057-NEW.cmake b/Tests/RunCMake/CMP0057/CMP0057-NEW.cmake
new file mode 100644
index 0000000..ebd7ba5
--- /dev/null
+++ b/Tests/RunCMake/CMP0057/CMP0057-NEW.cmake
@@ -0,0 +1,31 @@
+cmake_policy(SET CMP0057 NEW)
+
+set(MY_NON_EXISTENT_LIST)
+
+set(MY_EMPTY_LIST "")
+
+set(MY_LIST foo bar)
+
+if(NOT "foo" IN_LIST MY_LIST)
+ message(FATAL_ERROR "expected item 'foo' not found in list MY_LIST")
+endif()
+
+if("baz" IN_LIST MY_LIST)
+ message(FATAL_ERROR "unexpected item 'baz' found in list MY_LIST")
+endif()
+
+if("foo" IN_LIST MY_NON_EXISTENT_LIST)
+ message(FATAL_ERROR
+ "unexpected item 'baz' found in non existent list MY_NON_EXISTENT_LIST")
+endif()
+
+if("foo" IN_LIST MY_EMPTY_LIST)
+ message(FATAL_ERROR
+ "unexpected item 'baz' found in empty list MY_EMPTY_LIST")
+endif()
+
+set(VAR "foo")
+
+if(NOT VAR IN_LIST MY_LIST)
+ message(FATAL_ERROR "expected item VAR not found in list MY_LIST")
+endif()
diff --git a/Tests/RunCMake/CMP0057/CMP0057-OLD-result.txt b/Tests/RunCMake/CMP0057/CMP0057-OLD-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0057/CMP0057-OLD-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0057/CMP0057-OLD-stderr.txt b/Tests/RunCMake/CMP0057/CMP0057-OLD-stderr.txt
new file mode 100644
index 0000000..f3fad8d
--- /dev/null
+++ b/Tests/RunCMake/CMP0057/CMP0057-OLD-stderr.txt
@@ -0,0 +1,8 @@
+CMake Error at CMP0057-OLD.cmake:5 \(if\):
+ if given arguments:
+
+ "foo" "IN_LIST" "MY_LIST"
+
+ Unknown arguments specified
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/CMP0057/CMP0057-OLD.cmake b/Tests/RunCMake/CMP0057/CMP0057-OLD.cmake
new file mode 100644
index 0000000..cf9ec89
--- /dev/null
+++ b/Tests/RunCMake/CMP0057/CMP0057-OLD.cmake
@@ -0,0 +1,7 @@
+cmake_policy(SET CMP0057 OLD)
+
+set(MY_LIST foo bar)
+
+if("foo" IN_LIST MY_LIST)
+ message("foo is in MY_LIST")
+endif()
diff --git a/Tests/RunCMake/CMP0057/CMP0057-WARN-result.txt b/Tests/RunCMake/CMP0057/CMP0057-WARN-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0057/CMP0057-WARN-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt b/Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt
new file mode 100644
index 0000000..b1c9b63
--- /dev/null
+++ b/Tests/RunCMake/CMP0057/CMP0057-WARN-stderr.txt
@@ -0,0 +1,19 @@
+CMake Warning \(dev\) at CMP0057-WARN.cmake:3 \(if\):
+ Policy CMP0057 is not set: Support new IN_LIST if\(\) operator. Run "cmake
+ --help-policy CMP0057" for policy details. Use the cmake_policy command to
+ set the policy and suppress this warning.
+
+ IN_LIST will be interpreted as an operator when the policy is set to NEW.
+ Since the policy is not set the OLD behavior will be used.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
+
+CMake Error at CMP0057-WARN.cmake:3 \(if\):
+ if given arguments:
+
+ "foo" "IN_LIST" "MY_LIST"
+
+ Unknown arguments specified
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/CMP0057/CMP0057-WARN.cmake b/Tests/RunCMake/CMP0057/CMP0057-WARN.cmake
new file mode 100644
index 0000000..45f53a5
--- /dev/null
+++ b/Tests/RunCMake/CMP0057/CMP0057-WARN.cmake
@@ -0,0 +1,5 @@
+set(MY_LIST foo bar)
+
+if("foo" IN_LIST MY_LIST)
+ message("foo is in MY_LIST")
+endif()
diff --git a/Tests/RunCMake/CMP0057/CMakeLists.txt b/Tests/RunCMake/CMP0057/CMakeLists.txt
new file mode 100644
index 0000000..18dfd26
--- /dev/null
+++ b/Tests/RunCMake/CMP0057/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.2)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0057/RunCMakeTest.cmake b/Tests/RunCMake/CMP0057/RunCMakeTest.cmake
new file mode 100644
index 0000000..719e054
--- /dev/null
+++ b/Tests/RunCMake/CMP0057/RunCMakeTest.cmake
@@ -0,0 +1,5 @@
+include(RunCMake)
+
+run_cmake(CMP0057-OLD)
+run_cmake(CMP0057-WARN)
+run_cmake(CMP0057-NEW)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index dc18764..d5f1d22 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -63,6 +63,7 @@ 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")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32a2f41402d38e1c5be3547bd042328df0b28124
commit 32a2f41402d38e1c5be3547bd042328df0b28124
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Apr 29 15:09:24 2015 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 30 10:20:20 2015 -0400
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.
diff --git a/Help/policy/CMP0057.rst b/Help/policy/CMP0057.rst
index 5cf0784..377f22d 100644
--- a/Help/policy/CMP0057.rst
+++ b/Help/policy/CMP0057.rst
@@ -1,21 +1,4 @@
CMP0057
-------
-Disallow multiple ``MAIN_DEPENDENCY`` specifications for the same file.
-
-CMake 3.3 and above no longer allow the same input file to be used
-as a ``MAIN_DEPENDENCY`` in more than one custom command.
-
-Listing the same input file more than once in this context has not been
-supported by earlier versions either and would lead to build time issues
-but was not diagnosed.
-
-The ``OLD`` behavior for this policy is to allow using the same input file
-in a ``MAIN_DEPENDENCY`` specfication more than once.
-The ``NEW`` behavior is to disallow using the same input file in a
-``MAIN_DEPENDENCY`` specification more than once.
-
-This policy was introduced in CMake version 3.3.
-CMake version |release| warns when the policy is not set and uses
-``OLD`` behavior. Use the :command:`cmake_policy` command to set
-it to ``OLD`` or ``NEW`` explicitly.
+This policy is reserved for future use.
diff --git a/Help/release/dev/main_dependency_diagnostic.rst b/Help/release/dev/main_dependency_diagnostic.rst
deleted file mode 100644
index 13486ef..0000000
--- a/Help/release/dev/main_dependency_diagnostic.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-main_dependency_diagnostic
---------------------------
-
-* Listing the same input file as a MAIN_DEPENDENCY of a custom command
- can lead to broken build time behavior. This is now diagnosed.
- See policy :policy:`CMP0057`.
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 1862876..96b0b35 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -204,7 +204,8 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
${swig_include_dirs}
-o "${swig_generated_file_fullname}"
"${swig_source_file_fullname}"
- DEPENDS "${swig_source_file_fullname}" ${SWIG_MODULE_${name}_EXTRA_DEPS}
+ MAIN_DEPENDENCY "${swig_source_file_fullname}"
+ DEPENDS ${SWIG_MODULE_${name}_EXTRA_DEPS}
COMMENT "Swig source")
set_source_files_properties("${swig_generated_file_fullname}" ${swig_extra_generated_files}
PROPERTIES GENERATED 1)
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c77a90c..0f0cb34 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -877,33 +877,6 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
}
else
{
- std::ostringstream e;
- cmake::MessageType messageType = cmake::AUTHOR_WARNING;
- bool issueMessage = false;
-
- switch(this->GetPolicyStatus(cmPolicies::CMP0057))
- {
- case cmPolicies::WARN:
- e << (this->GetPolicies()->
- GetPolicyWarning(cmPolicies::CMP0057)) << "\n";
- issueMessage = true;
- case cmPolicies::OLD:
- break;
- case cmPolicies::NEW:
- case cmPolicies::REQUIRED_IF_USED:
- case cmPolicies::REQUIRED_ALWAYS:
- issueMessage = true;
- messageType = cmake::FATAL_ERROR;
- break;
- }
-
- if(issueMessage)
- {
- e << "\"" << main_dependency << "\" can only be specified as a "
- "custom command MAIN_DEPENDENCY once.";
- IssueMessage(messageType, e.str());
- }
-
// The existing custom command is different. We need to
// generate a rule file for this new command.
file = 0;
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index e7678cb..ab60f93 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -377,11 +377,6 @@ cmPolicies::cmPolicies()
3,2,0, cmPolicies::WARN);
this->DefinePolicy(
- CMP0057, "CMP0057",
- "Disallow multiple MAIN_DEPENDENCY specifications for the same file.",
- 3,3,0, cmPolicies::WARN);
-
- this->DefinePolicy(
CMP0058, "CMP0058",
"Ninja requires custom command byproducts to be explicit.",
3,3,0, cmPolicies::WARN);
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 1d108c1..90acf8e 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -113,8 +113,6 @@ public:
/// or keywords when unquoted.
CMP0055, ///< Strict checking for break() command.
CMP0056, ///< Honor link flags in try_compile() source-file signature.
- CMP0057, ///< Disallow multiple MAIN_DEPENDENCY specifications
- /// for the same file.
CMP0058, ///< Ninja requires custom command byproducts to be explicit
CMP0059, ///< Do not treat ``DEFINITIONS`` as a built-in directory
/// property.
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
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")
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list