summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-09-02 20:09:22 (GMT)
committerBrad King <brad.king@kitware.com>2015-09-02 20:11:29 (GMT)
commit18d7f8fbfbf9a03ff0742c26a349a2030cecb9d5 (patch)
treea6ddd54a4106f616f49a785f95bb1e593cea9e02 /Tests
parent9e21b01a4d4781cdcfb8990bdf72a11c83da3887 (diff)
downloadCMake-18d7f8fbfbf9a03ff0742c26a349a2030cecb9d5.zip
CMake-18d7f8fbfbf9a03ff0742c26a349a2030cecb9d5.tar.gz
CMake-18d7f8fbfbf9a03ff0742c26a349a2030cecb9d5.tar.bz2
Tests: Move LINK_SEARCH_{START,END}_STATIC case to dedicated test
The test case added to RunCMake.set_property by commit 675ef165 (Allow LINK_SEARCH_{START,END}_STATIC props to have default values, 2015-08-07) is not a test of the set_property command and so belongs in its own test case. Create a new RunCMake.LinkStatic test to cover cases related to static linking. While at it, simplify the LINK_SEARCH_STATIC test case to enable only C.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/CMakeLists.txt1
-rw-r--r--Tests/RunCMake/LinkStatic/CMakeLists.txt3
-rw-r--r--Tests/RunCMake/LinkStatic/LINK_SEARCH_STATIC.cmake (renamed from Tests/RunCMake/set_property/LINK_SEARCH_STATIC.cmake)2
-rw-r--r--Tests/RunCMake/LinkStatic/LinkStatic.c (renamed from Tests/RunCMake/set_property/LinkStatic.c)0
-rw-r--r--Tests/RunCMake/LinkStatic/RunCMakeTest.cmake3
-rw-r--r--Tests/RunCMake/set_property/RunCMakeTest.cmake1
6 files changed, 8 insertions, 2 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index c274d8f..8728ea6 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -139,6 +139,7 @@ add_RunCMake_test(GeneratorToolset)
add_RunCMake_test(GNUInstallDirs)
add_RunCMake_test(TargetPropertyGeneratorExpressions)
add_RunCMake_test(Languages)
+add_RunCMake_test(LinkStatic)
add_RunCMake_test(ObjectLibrary)
add_RunCMake_test(Swift)
add_RunCMake_test(TargetObjects)
diff --git a/Tests/RunCMake/LinkStatic/CMakeLists.txt b/Tests/RunCMake/LinkStatic/CMakeLists.txt
new file mode 100644
index 0000000..74b3ff8
--- /dev/null
+++ b/Tests/RunCMake/LinkStatic/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.3)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/set_property/LINK_SEARCH_STATIC.cmake b/Tests/RunCMake/LinkStatic/LINK_SEARCH_STATIC.cmake
index 70d2fee..6db5c85 100644
--- a/Tests/RunCMake/set_property/LINK_SEARCH_STATIC.cmake
+++ b/Tests/RunCMake/LinkStatic/LINK_SEARCH_STATIC.cmake
@@ -1,4 +1,4 @@
-project(LinkSearchStatic)
+enable_language(C)
set(CMAKE_LINK_SEARCH_START_STATIC ON)
add_executable(LinkSearchStartStaticInit1 LinkStatic.c)
diff --git a/Tests/RunCMake/set_property/LinkStatic.c b/Tests/RunCMake/LinkStatic/LinkStatic.c
index 3600977..3600977 100644
--- a/Tests/RunCMake/set_property/LinkStatic.c
+++ b/Tests/RunCMake/LinkStatic/LinkStatic.c
diff --git a/Tests/RunCMake/LinkStatic/RunCMakeTest.cmake b/Tests/RunCMake/LinkStatic/RunCMakeTest.cmake
new file mode 100644
index 0000000..0d29492
--- /dev/null
+++ b/Tests/RunCMake/LinkStatic/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(LINK_SEARCH_STATIC)
diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake b/Tests/RunCMake/set_property/RunCMakeTest.cmake
index ada8804..54e63f7 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -1,4 +1,3 @@
include(RunCMake)
run_cmake(LINK_LIBRARIES)
-run_cmake(LINK_SEARCH_STATIC)