[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7047-g59441d2
Nils Gladitz
nilsgladitz at gmail.com
Sun Jan 12 07:27:19 EST 2014
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 59441d2cc7e7f4b07d7a8a77b31ed8cbd21d5dee (commit)
via 9e8e2a10a5f0388485c8423564da2e45b5b8538f (commit)
from ebf118227cfe1d6a90bc35bfc4b4ff8906f98ff2 (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=59441d2cc7e7f4b07d7a8a77b31ed8cbd21d5dee
commit 59441d2cc7e7f4b07d7a8a77b31ed8cbd21d5dee
Merge: ebf1182 9e8e2a1
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sun Jan 12 07:27:18 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 12 07:27:18 2014 -0500
Merge topic 'missing-dependency-error' into next
9e8e2a10 Revert "AddDependencies: new policy requires dependencies to exist"
diff --cc Source/cmComputeTargetDepends.cxx
index b5c5ed1,73a8e27..53f098c
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@@ -340,51 -337,12 +340,12 @@@ void cmComputeTargetDepends::AddTargetD
bool linking)
{
// Get the depender.
- cmTarget const* depender = this->Targets[depender_index];
+ cmGeneratorTarget const* depender = this->Targets[depender_index];
// Check the target's makefile first.
- cmTarget const* dependee =
- depender->GetMakefile()->FindTargetToUse(dependee_name);
+ cmGeneratorTarget const* dependee =
+ depender->GetMakefile()->FindGeneratorTargetToUse(dependee_name);
- if(!dependee && !linking &&
- (depender->GetType() != cmTarget::GLOBAL_TARGET))
- {
- cmMakefile *makefile = depender->GetMakefile();
- cmake::MessageType messageType = cmake::AUTHOR_WARNING;
- bool issueMessage = false;
- switch(makefile->GetPolicyStatus(cmPolicies::CMP0046))
- {
- case cmPolicies::WARN:
- issueMessage = true;
- case cmPolicies::OLD:
- break;
- case cmPolicies::NEW:
- case cmPolicies::REQUIRED_IF_USED:
- case cmPolicies::REQUIRED_ALWAYS:
- issueMessage = true;
- messageType = cmake::FATAL_ERROR;
- }
- if(issueMessage)
- {
- cmake* cm = this->GlobalGenerator->GetCMakeInstance();
- cmOStringStream e;
- e << (makefile->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0046)) << "\n";
- e << "The dependency target \"" << dependee_name
- << "\" of target \"" << depender->GetName() << "\" does not exist.";
-
- cmListFileBacktrace nullBacktrace;
- cmListFileBacktrace const* backtrace =
- depender->GetUtilityBacktrace(dependee_name);
- if(!backtrace)
- {
- backtrace = &nullBacktrace;
- }
-
- cm->IssueMessage(messageType, e.str(), *backtrace);
- }
- }
-
// Skip targets that will not really be linked. This is probably a
// name conflict between an external library and an executable
// within the project.
diff --cc Source/cmTarget.h
index e791756,26d391f..2d95949
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@@ -462,9 -691,9 +461,8 @@@ private
std::string RuntimeInstallPath;
mutable std::string ExportMacro;
std::set<cmStdString> Utilities;
- std::map<cmStdString, cmListFileBacktrace> UtilityBacktraces;
bool RecordDependencies;
mutable cmPropertyMap Properties;
- LinkLibraryVectorType OriginalLinkLibraries;
bool DLLPlatform;
bool IsApple;
bool IsImportedTarget;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e8e2a10a5f0388485c8423564da2e45b5b8538f
commit 9e8e2a10a5f0388485c8423564da2e45b5b8538f
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sun Jan 12 13:26:32 2014 +0100
Commit: Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sun Jan 12 13:26:32 2014 +0100
Revert "AddDependencies: new policy requires dependencies to exist"
This reverts commit 0bf6f13b1dc278b68c1ddf94d838014852ada679.
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 891333c..4bee05e 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -97,4 +97,3 @@ All Policies
/policy/CMP0043
/policy/CMP0044
/policy/CMP0045
- /policy/CMP0046
diff --git a/Help/policy/CMP0046.rst b/Help/policy/CMP0046.rst
deleted file mode 100644
index 5192dc7..0000000
--- a/Help/policy/CMP0046.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-CMP0046
--------
-
-Error on non-existent dependency in add_dependencies.
-
-CMake 2.8.12 and lower silently ignored non-existent dependencies
-listed in the :command:`add_dependencies` command.
-
-The OLD behavior for this policy is to silently ignore non-existent
-dependencies. The NEW behavior for this policy is to report an error
-if non-existent dependencies are listed in the :command:`add_dependencies`
-command.
-
-This policy was introduced in CMake version 3.0.0.
-CMake version |release| warns when the policy is not set and uses
-OLD behavior. Use the cmake_policy command to set it to OLD or
-NEW explicitly.
diff --git a/Source/cmAddDependenciesCommand.cxx b/Source/cmAddDependenciesCommand.cxx
index a7ffded..87bfb3c 100644
--- a/Source/cmAddDependenciesCommand.cxx
+++ b/Source/cmAddDependenciesCommand.cxx
@@ -46,7 +46,7 @@ bool cmAddDependenciesCommand
++s; // skip over target_name
for (; s != args.end(); ++s)
{
- target->AddUtility(s->c_str(), this->Makefile);
+ target->AddUtility(s->c_str());
}
}
else
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index a848e4f..73a8e27 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -343,45 +343,6 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
cmTarget const* dependee =
depender->GetMakefile()->FindTargetToUse(dependee_name);
- if(!dependee && !linking &&
- (depender->GetType() != cmTarget::GLOBAL_TARGET))
- {
- cmMakefile *makefile = depender->GetMakefile();
- cmake::MessageType messageType = cmake::AUTHOR_WARNING;
- bool issueMessage = false;
- switch(makefile->GetPolicyStatus(cmPolicies::CMP0046))
- {
- case cmPolicies::WARN:
- issueMessage = true;
- case cmPolicies::OLD:
- break;
- case cmPolicies::NEW:
- case cmPolicies::REQUIRED_IF_USED:
- case cmPolicies::REQUIRED_ALWAYS:
- issueMessage = true;
- messageType = cmake::FATAL_ERROR;
- }
- if(issueMessage)
- {
- cmake* cm = this->GlobalGenerator->GetCMakeInstance();
- cmOStringStream e;
- e << (makefile->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0046)) << "\n";
- e << "The dependency target \"" << dependee_name
- << "\" of target \"" << depender->GetName() << "\" does not exist.";
-
- cmListFileBacktrace nullBacktrace;
- cmListFileBacktrace const* backtrace =
- depender->GetUtilityBacktrace(dependee_name);
- if(!backtrace)
- {
- backtrace = &nullBacktrace;
- }
-
- cm->IssueMessage(messageType, e.str(), *backtrace);
- }
- }
-
// Skip targets that will not really be linked. This is probably a
// name conflict between an external library and an executable
// within the project.
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 020a782..5a189f8 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -331,11 +331,6 @@ cmPolicies::cmPolicies()
CMP0045, "CMP0045",
"Error on non-existent target in get_target_property.",
3,0,0,0, cmPolicies::WARN);
-
- this->DefinePolicy(
- CMP0046, "CMP0046",
- "Error on non-existent dependency in add_dependencies.",
- 3,0,0,0, cmPolicies::WARN);
}
cmPolicies::~cmPolicies()
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 38f47f1..b1342bf 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -99,7 +99,6 @@ public:
CMP0043, ///< Ignore COMPILE_DEFINITIONS_<Config> properties
CMP0044, ///< Case sensitive <LANG>_COMPILER_ID generator expressions
CMP0045, ///< Error on non-existent target in get_target_property
- CMP0046, ///< Error on non-existent dependency in add_dependencies
/** \brief Always the last entry.
*
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 24fa0c5..4828d20 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -402,26 +402,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
}
//----------------------------------------------------------------------------
-void cmTarget::AddUtility(const char *u, cmMakefile *makefile)
-{
- this->Utilities.insert(u);
- if(makefile)
- {
- makefile->GetBacktrace(UtilityBacktraces[u]);
- }
-}
-
-//----------------------------------------------------------------------------
-cmListFileBacktrace const* cmTarget::GetUtilityBacktrace(const char *u) const
-{
- std::map<cmStdString, cmListFileBacktrace>::const_iterator i =
- this->UtilityBacktraces.find(u);
- if(i == this->UtilityBacktraces.end()) return 0;
-
- return &i->second;
-}
-
-//----------------------------------------------------------------------------
void cmTarget::FinishConfigure()
{
// Erase any cached link information that might have been comptued
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index ce0d812..26d391f 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -242,10 +242,9 @@ public:
* name as would be specified to the ADD_EXECUTABLE or UTILITY_SOURCE
* commands. It is not a full path nor does it have an extension.
*/
- void AddUtility(const char* u, cmMakefile *makefile = 0);
+ void AddUtility(const char* u) { this->Utilities.insert(u);}
///! Get the utilities used by this target
std::set<cmStdString>const& GetUtilities() const { return this->Utilities; }
- cmListFileBacktrace const* GetUtilityBacktrace(const char* u) const;
/** Finalize the target at the end of the Configure step. */
void FinishConfigure();
@@ -692,7 +691,6 @@ private:
std::string RuntimeInstallPath;
mutable std::string ExportMacro;
std::set<cmStdString> Utilities;
- std::map<cmStdString, cmListFileBacktrace> UtilityBacktraces;
bool RecordDependencies;
mutable cmPropertyMap Properties;
LinkLibraryVectorType OriginalLinkLibraries;
diff --git a/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency.cmake b/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency.cmake
deleted file mode 100644
index 0be290a..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-cmake_policy(SET CMP0046 NEW)
-
-add_custom_target(foo)
-add_custom_target(bar)
-add_dependencies(foo bar)
diff --git a/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-result.txt b/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt
deleted file mode 100644
index 0c23c43..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-CMake Error at CMP0046-NEW-missing-dependency.cmake:4 \(add_dependencies\):
- Policy CMP0046 is not set: Error on non-existent dependency in
- add_dependencies. Run "cmake --help-policy CMP0046" for policy details.
- Use the cmake_policy command to set the policy and suppress this warning.
-+
- The dependency target "bar" of target "foo" does not exist.
-Call Stack \(most recent call first\):
- CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency.cmake b/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency.cmake
deleted file mode 100644
index 9bb6b90..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_policy(SET CMP0046 NEW)
-
-add_custom_target(foo)
-add_dependencies(foo bar)
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency.cmake b/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency.cmake
deleted file mode 100644
index b22ab4f..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-cmake_policy(SET CMP0046 OLD)
-
-add_custom_target(foo)
-add_custom_target(bar)
-add_dependencies(foo bar)
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency.cmake b/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency.cmake
deleted file mode 100644
index 5ee3cb7..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_policy(SET CMP0046 OLD)
-
-add_custom_target(foo)
-add_dependencies(foo bar)
diff --git a/Tests/RunCMake/CMP0046/CMP0046-WARN-missing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-WARN-missing-dependency-stderr.txt
deleted file mode 100644
index fed36f1..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-WARN-missing-dependency-stderr.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-CMake Warning \(dev\) at CMP0046-WARN-missing-dependency.cmake:2 \(add_dependencies\):
- Policy CMP0046 is not set: Error on non-existent dependency in
- add_dependencies. Run "cmake --help-policy CMP0046" for policy details.
- Use the cmake_policy command to set the policy and suppress this warning.
-+
- The dependency target "bar" of target "foo" does not exist.
-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/CMP0046/CMP0046-WARN-missing-dependency.cmake b/Tests/RunCMake/CMP0046/CMP0046-WARN-missing-dependency.cmake
deleted file mode 100644
index 896fa40..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-WARN-missing-dependency.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-add_custom_target(foo)
-add_dependencies(foo bar)
diff --git a/Tests/RunCMake/CMP0046/CMakeLists.txt b/Tests/RunCMake/CMP0046/CMakeLists.txt
deleted file mode 100644
index 2f10cb0..0000000
--- a/Tests/RunCMake/CMP0046/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-project(${RunCMake_TEST} CXX)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
diff --git a/Tests/RunCMake/CMP0046/RunCMakeTest.cmake b/Tests/RunCMake/CMP0046/RunCMakeTest.cmake
deleted file mode 100644
index 5131e5b..0000000
--- a/Tests/RunCMake/CMP0046/RunCMakeTest.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-include(RunCMake)
-
-run_cmake(CMP0046-OLD-missing-dependency)
-run_cmake(CMP0046-NEW-missing-dependency)
-run_cmake(CMP0046-WARN-missing-dependency)
-
-run_cmake(CMP0046-OLD-existing-dependency)
-run_cmake(CMP0046-NEW-existing-dependency)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 1c23bcd..77700d7 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -66,7 +66,6 @@ if(CMAKE_SYSTEM_NAME MATCHES Darwin AND CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG)
endif()
add_RunCMake_test(CMP0043)
add_RunCMake_test(CMP0045)
-add_RunCMake_test(CMP0046)
add_RunCMake_test(CTest)
if(UNIX AND "${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles")
add_RunCMake_test(CompilerChange)
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-policies.7.rst | 1 -
Help/policy/CMP0046.rst | 17 ---------
Source/cmAddDependenciesCommand.cxx | 2 +-
Source/cmComputeTargetDepends.cxx | 39 --------------------
Source/cmPolicies.cxx | 5 ---
Source/cmPolicies.h | 1 -
Source/cmTarget.cxx | 20 ----------
Source/cmTarget.h | 4 +-
.../CMP0046-NEW-existing-dependency-stderr.txt | 1 -
.../CMP0046/CMP0046-NEW-existing-dependency.cmake | 5 ---
.../CMP0046-NEW-missing-dependency-result.txt | 1 -
.../CMP0046-NEW-missing-dependency-stderr.txt | 8 ----
.../CMP0046/CMP0046-NEW-missing-dependency.cmake | 4 --
.../CMP0046-OLD-existing-dependency-stderr.txt | 1 -
.../CMP0046/CMP0046-OLD-existing-dependency.cmake | 5 ---
.../CMP0046-OLD-missing-dependency-stderr.txt | 1 -
.../CMP0046/CMP0046-OLD-missing-dependency.cmake | 4 --
.../CMP0046-WARN-missing-dependency-stderr.txt | 9 -----
.../CMP0046/CMP0046-WARN-missing-dependency.cmake | 2 -
Tests/RunCMake/CMP0046/CMakeLists.txt | 3 --
Tests/RunCMake/CMP0046/RunCMakeTest.cmake | 8 ----
Tests/RunCMake/CMakeLists.txt | 1 -
22 files changed, 2 insertions(+), 140 deletions(-)
delete mode 100644 Help/policy/CMP0046.rst
delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency.cmake
delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-result.txt
delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency-stderr.txt
delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-NEW-missing-dependency.cmake
delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency.cmake
delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency.cmake
delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-WARN-missing-dependency-stderr.txt
delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-WARN-missing-dependency.cmake
delete mode 100644 Tests/RunCMake/CMP0046/CMakeLists.txt
delete mode 100644 Tests/RunCMake/CMP0046/RunCMakeTest.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list