[Cmake-commits] CMake branch, master, updated. v2.8.10.2-397-gaf770bc
Brad King
brad.king at kitware.com
Tue Jan 8 14:32:07 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, master has been updated
via af770bc27e7870ef2e3796163ff610773cb51a38 (commit)
via 09a0da77891bae3820b48c44c48bef3837b0a6e2 (commit)
from 97758f29206a172524edd144e588558bb4a83700 (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=af770bc27e7870ef2e3796163ff610773cb51a38
commit af770bc27e7870ef2e3796163ff610773cb51a38
Merge: 97758f2 09a0da7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 8 14:31:57 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 8 14:31:57 2013 -0500
Merge topic 'deprecate-load_command'
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)
-----------------------------------------------------------------------
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