[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5069-g47e7949

[Stephen Kelly]

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  47e794938bc02d8573192447d61ccff4bce4256c (commit)
       via  9ec41ed7ea35e5a1d490642df09dc115b7365c33 (commit)
       via  13da9f00245694d3dee9f4c9b245f0e3941284c5 (commit)
      from  d07a0f44c99bb0cbfa8c80ff05c7102858cda361 (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=47e794938bc02d8573192447d61ccff4bce4256c
commit 47e794938bc02d8573192447d61ccff4bce4256c
Merge: d07a0f4 9ec41ed
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 12 04:16:49 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 12 04:16:49 2013 -0500

    Merge topic 'fix-INTERFACE-with-no-SHARED-libs' into next
    
    9ec41ed Don't report an error on platforms with no shared libs (#14561).
    13da9f0 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ec41ed7ea35e5a1d490642df09dc115b7365c33
commit 9ec41ed7ea35e5a1d490642df09dc115b7365c33
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 12 10:13:15 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 12 10:15:08 2013 +0100

    Don't report an error on platforms with no shared libs (#14561).

diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 4c591b6..e9c5d6b 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -229,6 +229,7 @@ bool cmAddLibraryCommand
     yet its linker language. */
   if ((type != cmTarget::STATIC_LIBRARY) &&
       (type != cmTarget::OBJECT_LIBRARY) &&
+      (type != cmTarget::INTERFACE_LIBRARY) &&
        (this->Makefile->GetCMakeInstance()->GetPropertyAsBool(
                                       "TARGET_SUPPORTS_SHARED_LIBS") == false))
     {
diff --git a/Tests/RunCMake/interface_library/RunCMakeTest.cmake b/Tests/RunCMake/interface_library/RunCMakeTest.cmake
index 56caf68..7375888 100644
--- a/Tests/RunCMake/interface_library/RunCMakeTest.cmake
+++ b/Tests/RunCMake/interface_library/RunCMakeTest.cmake
@@ -2,3 +2,4 @@ include(RunCMake)
 
 run_cmake(invalid_name)
 run_cmake(target_commands)
+run_cmake(no_shared_libs)
diff --git a/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt b/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/interface_library/no_shared_libs.cmake b/Tests/RunCMake/interface_library/no_shared_libs.cmake
new file mode 100644
index 0000000..ed81878
--- /dev/null
+++ b/Tests/RunCMake/interface_library/no_shared_libs.cmake
@@ -0,0 +1,5 @@
+
+cmake_minimum_required(VERSION 2.8.12.20131009)
+set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
+add_library(foo INTERFACE)
+target_compile_definitions(foo INTERFACE FOO_DEFINE)

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

Summary of changes:
 Source/CMakeVersion.cmake                          |    2 +-
 Source/cmAddLibraryCommand.cxx                     |    1 +
 .../RunCMake/interface_library/RunCMakeTest.cmake  |    1 +
 .../no_shared_libs-stderr.txt}                     |    0
 .../interface_library/no_shared_libs.cmake         |    5 +++++
 5 files changed, 8 insertions(+), 1 deletions(-)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => interface_library/no_shared_libs-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/interface_library/no_shared_libs.cmake


hooks/post-receive
-- 
CMake