diff options
author | Brad King <brad.king@kitware.com> | 2013-01-07 15:31:07 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-01-07 15:31:07 (GMT) |
commit | 09a0da77891bae3820b48c44c48bef3837b0a6e2 (patch) | |
tree | 18f5ee735b072f9c4bced34d668ca858243eb660 /Tests | |
parent | d2d43986e7f5013465473a71c393fc3897cecbac (diff) | |
download | CMake-09a0da77891bae3820b48c44c48bef3837b0a6e2.zip CMake-09a0da77891bae3820b48c44c48bef3837b0a6e2.tar.gz CMake-09a0da77891bae3820b48c44c48bef3837b0a6e2.tar.bz2 |
Revert "load_command: Deprecate and document pending removal"
This reverts commit d2d43986e7f5013465473a71c393fc3897cecbac.
We will add a policy to remove the command more gracefully.
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 1 | ||||
-rw-r--r-- | Tests/RunCMake/load_command/CMakeLists.txt | 3 | ||||
-rw-r--r-- | Tests/RunCMake/load_command/LoadCommandDeprecated-stderr.txt | 6 | ||||
-rw-r--r-- | Tests/RunCMake/load_command/LoadCommandDeprecated.cmake | 1 | ||||
-rw-r--r-- | Tests/RunCMake/load_command/RunCMakeTest.cmake | 3 |
5 files changed, 0 insertions, 14 deletions
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) |