diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-13 19:31:19 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-13 19:31:19 (GMT) |
| commit | 70b176e276e874b78562519b48fa2cee6e05cd6b (patch) | |
| tree | 97d185c1983ff40e665c2b5220a410780ba9b0c5 /Tests | |
| parent | 8f47c8bed1aa1c0eb0130f0f2d2b64f5c14aa53f (diff) | |
| parent | d2d43986e7f5013465473a71c393fc3897cecbac (diff) | |
| download | CMake-70b176e276e874b78562519b48fa2cee6e05cd6b.zip CMake-70b176e276e874b78562519b48fa2cee6e05cd6b.tar.gz CMake-70b176e276e874b78562519b48fa2cee6e05cd6b.tar.bz2 | |
Merge topic 'deprecate-load_command'
d2d4398 load_command: Deprecate and document pending removal
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, 14 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 8c67625..360ad78 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -55,6 +55,7 @@ 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) diff --git a/Tests/RunCMake/load_command/CMakeLists.txt b/Tests/RunCMake/load_command/CMakeLists.txt new file mode 100644 index 0000000..e8db6b0 --- /dev/null +++ b/Tests/RunCMake/load_command/CMakeLists.txt @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..7d374b2 --- /dev/null +++ b/Tests/RunCMake/load_command/LoadCommandDeprecated-stderr.txt @@ -0,0 +1,6 @@ +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 new file mode 100644 index 0000000..9e9b1f4 --- /dev/null +++ b/Tests/RunCMake/load_command/LoadCommandDeprecated.cmake @@ -0,0 +1 @@ +load_command() diff --git a/Tests/RunCMake/load_command/RunCMakeTest.cmake b/Tests/RunCMake/load_command/RunCMakeTest.cmake new file mode 100644 index 0000000..9a0f98d --- /dev/null +++ b/Tests/RunCMake/load_command/RunCMakeTest.cmake @@ -0,0 +1,3 @@ +include(RunCMake) + +run_cmake(LoadCommandDeprecated) |