[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5091-gcba9471

[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  cba9471effa94673598149124ec533e98a8afb71 (commit)
       via  64f73b0fb630f3ecc2f94e3e5b4ab2d1cc117f50 (commit)
      from  eddf494c8227254ef82fca289a2978d056772d19 (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=cba9471effa94673598149124ec533e98a8afb71
commit cba9471effa94673598149124ec533e98a8afb71
Merge: eddf494 64f73b0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 12 09:09:11 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 12 09:09:11 2013 -0500

    Merge branch 'fix-INTERFACE-with-no-SHARED-libs' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64f73b0fb630f3ecc2f94e3e5b4ab2d1cc117f50
commit 64f73b0fb630f3ecc2f94e3e5b4ab2d1cc117f50
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 12 10:13:15 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 12 09:07:10 2013 -0500

    add_library: Fix INTERFACE 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:


hooks/post-receive
-- 
CMake