[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1030-g90db0ab

[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  90db0ab1f178901caab463d797b262f015407cca (commit)
       via  bd360ee329e74487dba526d7847794bc66b55494 (commit)
      from  47485f0dfa70754c6ff54d297546ab4b9b79fa31 (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=90db0ab1f178901caab463d797b262f015407cca
commit 90db0ab1f178901caab463d797b262f015407cca
Merge: 47485f0 bd360ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 3 09:06:03 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 3 09:06:03 2014 -0500

    Merge topic 'fix-add_library-check-for-shared' into next
    
    bd360ee3 add_library: Fix target type check for non-shared-lib platforms


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd360ee329e74487dba526d7847794bc66b55494
commit bd360ee329e74487dba526d7847794bc66b55494
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 3 08:50:05 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 3 08:51:11 2014 -0500

    add_library: Fix target type check for non-shared-lib platforms
    
    When checking target types for TARGET_SUPPORTS_SHARED_LIBS == false,
    enumerate exactly the library types not supported rather than trying to
    maintain a list of all the types that are supported.  Otherwise
    
     add_library(SomeImportedLib UNKNOWN IMPORTED)
    
    warns on platforms that do not support shared libraries.
    
    Reported-by: Kelly Thompson <kgt at lanl.gov>

diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index cdc9f2a..bba4d41 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -328,9 +328,8 @@ bool cmAddLibraryCommand
     CMAKE_${LANG}_CREATE_SHARED_LIBRARY is defined and if not default to
     STATIC. But at this point we know only the name of the target, but not
     yet its linker language. */
-  if ((type != cmTarget::STATIC_LIBRARY) &&
-      (type != cmTarget::OBJECT_LIBRARY) &&
-      (type != cmTarget::INTERFACE_LIBRARY) &&
+  if ((type == cmTarget::SHARED_LIBRARY ||
+       type == cmTarget::MODULE_LIBRARY) &&
        (this->Makefile->GetCMakeInstance()->GetPropertyAsBool(
                                       "TARGET_SUPPORTS_SHARED_LIBS") == false))
     {

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

Summary of changes:
 Source/cmAddLibraryCommand.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake