[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1430-gfd97a2c
Brad King
brad.king at kitware.com
Mon Jan 7 10:35:50 EST 2013
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 fd97a2c77eb6509f70d7b9dd37b6d1e4202a7b52 (commit)
via 09a0da77891bae3820b48c44c48bef3837b0a6e2 (commit)
from e26c19a3ee3259d05953b0dbdecd89c328be7aa5 (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=fd97a2c77eb6509f70d7b9dd37b6d1e4202a7b52
commit fd97a2c77eb6509f70d7b9dd37b6d1e4202a7b52
Merge: e26c19a 09a0da7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 7 10:35:34 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 7 10:35:34 2013 -0500
Merge topic 'deprecate-load_command' into next
09a0da7 Revert "load_command: Deprecate and document pending removal"
diff --cc Tests/RunCMake/CMakeLists.txt
index cc544a3,3ea54f1..fec64b5
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -54,9 -52,7 +54,8 @@@ add_RunCMake_test(ObjectLibrary
add_RunCMake_test(build_command)
add_RunCMake_test(find_package)
add_RunCMake_test(include)
+add_RunCMake_test(include_directories)
add_RunCMake_test(list)
- add_RunCMake_test(load_command)
if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]")
add_RunCMake_test(include_external_msproject)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09a0da77891bae3820b48c44c48bef3837b0a6e2
commit 09a0da77891bae3820b48c44c48bef3837b0a6e2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 7 10:31:07 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 7 10:31:07 2013 -0500
Revert "load_command: Deprecate and document pending removal"
This reverts commit d2d43986e7f5013465473a71c393fc3897cecbac.
We will add a policy to remove the command more gracefully.
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx
index 181b922..b2acf06 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@@ -224,10 +224,6 @@ cmLoadedCommand::~cmLoadedCommand()
bool cmLoadCommandCommand
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
- this->Makefile->IssueMessage(
- cmake::AUTHOR_WARNING,
- "The \"load_command\" command will be removed in CMake 3.0. "
- "See command documentation for details.");
if(args.size() < 1 )
{
return true;
diff --git a/Source/cmLoadCommandCommand.h b/Source/cmLoadCommandCommand.h
index bcd1831..f0b34ee 100644
--- a/Source/cmLoadCommandCommand.h
+++ b/Source/cmLoadCommandCommand.h
@@ -47,7 +47,7 @@ public:
*/
virtual const char* GetTerseDocumentation() const
{
- return "Deprecated. Use macro() or function() instead.";
+ return "Load a command into a running CMake.";
}
/**
@@ -56,13 +56,6 @@ public:
virtual const char* GetFullDocumentation() const
{
return
- "This command will be removed in CMake 3.0. "
- "It works only when the target architecture matches the "
- "running CMake binary. "
- "Use macro() or function() to add commands. "
- "Use execute_process() to run advanced computations "
- "in external processes."
- "\n"
" load_command(COMMAND_NAME <loc1> [loc2 ...])\n"
"The given locations are searched for a library whose name is "
"cmCOMMAND_NAME. If found, it is loaded as a module and the command "
@@ -74,12 +67,6 @@ public:
"Otherwise the variable will not be set.";
}
- /** This command is kept for compatibility with older CMake versions. */
- virtual bool IsDiscouraged() const
- {
- return true;
- }
-
cmTypeMacro(cmLoadCommandCommand, cmCommand);
};
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index a484983..3ea54f1 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -53,7 +53,6 @@ add_RunCMake_test(build_command)
add_RunCMake_test(find_package)
add_RunCMake_test(include)
add_RunCMake_test(list)
-add_RunCMake_test(load_command)
if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]")
add_RunCMake_test(include_external_msproject)
diff --git a/Tests/RunCMake/load_command/CMakeLists.txt b/Tests/RunCMake/load_command/CMakeLists.txt
deleted file mode 100644
index e8db6b0..0000000
--- a/Tests/RunCMake/load_command/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/load_command/LoadCommandDeprecated-stderr.txt b/Tests/RunCMake/load_command/LoadCommandDeprecated-stderr.txt
deleted file mode 100644
index 7d374b2..0000000
--- a/Tests/RunCMake/load_command/LoadCommandDeprecated-stderr.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Warning \(dev\) at LoadCommandDeprecated.cmake:1 \(load_command\):
- The "load_command" command will be removed in CMake 3.0. See command
- documentation for details.
-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/load_command/LoadCommandDeprecated.cmake b/Tests/RunCMake/load_command/LoadCommandDeprecated.cmake
deleted file mode 100644
index 9e9b1f4..0000000
--- a/Tests/RunCMake/load_command/LoadCommandDeprecated.cmake
+++ /dev/null
@@ -1 +0,0 @@
-load_command()
diff --git a/Tests/RunCMake/load_command/RunCMakeTest.cmake b/Tests/RunCMake/load_command/RunCMakeTest.cmake
deleted file mode 100644
index 9a0f98d..0000000
--- a/Tests/RunCMake/load_command/RunCMakeTest.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-include(RunCMake)
-
-run_cmake(LoadCommandDeprecated)
-----------------------------------------------------------------------
Summary of changes:
Source/cmLoadCommandCommand.cxx | 4 ----
Source/cmLoadCommandCommand.h | 15 +--------------
Tests/RunCMake/CMakeLists.txt | 1 -
Tests/RunCMake/load_command/CMakeLists.txt | 3 ---
.../load_command/LoadCommandDeprecated-stderr.txt | 6 ------
.../load_command/LoadCommandDeprecated.cmake | 1 -
Tests/RunCMake/load_command/RunCMakeTest.cmake | 3 ---
7 files changed, 1 insertions(+), 32 deletions(-)
delete mode 100644 Tests/RunCMake/load_command/CMakeLists.txt
delete mode 100644 Tests/RunCMake/load_command/LoadCommandDeprecated-stderr.txt
delete mode 100644 Tests/RunCMake/load_command/LoadCommandDeprecated.cmake
delete mode 100644 Tests/RunCMake/load_command/RunCMakeTest.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list