[Cmake-commits] CMake branch, next, updated. v3.3.1-2735-g3f4a27b

[Brad King]

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, next has been updated
       via  3f4a27b904532e0e3bd3ff06cd7bbc039f8d4fa0 (commit)
       via  18d7f8fbfbf9a03ff0742c26a349a2030cecb9d5 (commit)
      from  c61f2a6a622abbde8168f40f65209958a7abe2ac (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=3f4a27b904532e0e3bd3ff06cd7bbc039f8d4fa0
commit 3f4a27b904532e0e3bd3ff06cd7bbc039f8d4fa0
Merge: c61f2a6 18d7f8f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 16:12:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 2 16:12:22 2015 -0400

    Merge topic 'add-link-search-static-properties-defaults' into next
    
    18d7f8fb Tests: Move LINK_SEARCH_{START,END}_STATIC case to dedicated test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18d7f8fbfbf9a03ff0742c26a349a2030cecb9d5
commit 18d7f8fbfbf9a03ff0742c26a349a2030cecb9d5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 16:09:22 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 2 16:11:29 2015 -0400

    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.

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
similarity index 98%
rename from Tests/RunCMake/set_property/LINK_SEARCH_STATIC.cmake
rename to 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
similarity index 100%
rename from Tests/RunCMake/set_property/LinkStatic.c
rename to Tests/RunCMake/LinkStatic/LinkStatic.c
diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake b/Tests/RunCMake/LinkStatic/RunCMakeTest.cmake
similarity index 65%
copy from Tests/RunCMake/set_property/RunCMakeTest.cmake
copy to Tests/RunCMake/LinkStatic/RunCMakeTest.cmake
index ada8804..0d29492 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/LinkStatic/RunCMakeTest.cmake
@@ -1,4 +1,3 @@
 include(RunCMake)
 
-run_cmake(LINK_LIBRARIES)
 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)

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                                        |    1 +
 Tests/RunCMake/{CMP0064 => LinkStatic}/CMakeLists.txt                |    0
 Tests/RunCMake/{set_property => LinkStatic}/LINK_SEARCH_STATIC.cmake |    2 +-
 Tests/RunCMake/{set_property => LinkStatic}/LinkStatic.c             |    0
 Tests/RunCMake/{set_property => LinkStatic}/RunCMakeTest.cmake       |    1 -
 Tests/RunCMake/set_property/RunCMakeTest.cmake                       |    1 -
 6 files changed, 2 insertions(+), 3 deletions(-)
 copy Tests/RunCMake/{CMP0064 => LinkStatic}/CMakeLists.txt (100%)
 rename Tests/RunCMake/{set_property => LinkStatic}/LINK_SEARCH_STATIC.cmake (98%)
 rename Tests/RunCMake/{set_property => LinkStatic}/LinkStatic.c (100%)
 copy Tests/RunCMake/{set_property => LinkStatic}/RunCMakeTest.cmake (65%)


hooks/post-receive
-- 
CMake