From 18d7f8fbfbf9a03ff0742c26a349a2030cecb9d5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Sep 2015 16:09:22 -0400 Subject: [PATCH] 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. --- Tests/RunCMake/CMakeLists.txt | 1 + Tests/RunCMake/LinkStatic/CMakeLists.txt | 3 +++ .../{set_property => LinkStatic}/LINK_SEARCH_STATIC.cmake | 2 +- Tests/RunCMake/{set_property => LinkStatic}/LinkStatic.c | 0 Tests/RunCMake/LinkStatic/RunCMakeTest.cmake | 3 +++ Tests/RunCMake/set_property/RunCMakeTest.cmake | 1 - 6 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Tests/RunCMake/LinkStatic/CMakeLists.txt rename Tests/RunCMake/{set_property => LinkStatic}/LINK_SEARCH_STATIC.cmake (98%) rename Tests/RunCMake/{set_property => LinkStatic}/LinkStatic.c (100%) create mode 100644 Tests/RunCMake/LinkStatic/RunCMakeTest.cmake diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index c274d8fb1e..8728ea6386 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 0000000000..74b3ff8de3 --- /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 similarity index 98% rename from Tests/RunCMake/set_property/LINK_SEARCH_STATIC.cmake rename to Tests/RunCMake/LinkStatic/LINK_SEARCH_STATIC.cmake index 70d2feea4d..6db5c857d6 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 similarity index 100% rename from Tests/RunCMake/set_property/LinkStatic.c rename to Tests/RunCMake/LinkStatic/LinkStatic.c diff --git a/Tests/RunCMake/LinkStatic/RunCMakeTest.cmake b/Tests/RunCMake/LinkStatic/RunCMakeTest.cmake new file mode 100644 index 0000000000..0d29492115 --- /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 ada8804c50..54e63f75c5 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)