[Cmake-commits] CMake branch, next, updated. v2.8.7-2658-g9d5a3c5

[Rolf Eike Beer]

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  9d5a3c5e673956e05bfd662bf6bdef2d29c9fe35 (commit)
       via  cfb3c86d273d1c8119541645389627e9b8819098 (commit)
       via  53f68e18cab6ee3e48324d795237e44f9775a803 (commit)
      from  c3c9b50240cc6a57897a6c3593282545e82cf85e (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=9d5a3c5e673956e05bfd662bf6bdef2d29c9fe35
commit 9d5a3c5e673956e05bfd662bf6bdef2d29c9fe35
Merge: c3c9b50 cfb3c86
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Feb 16 16:11:09 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 16 16:11:09 2012 -0500

    Merge topic 'findlibrary-versioned-libraries' into next
    
    cfb3c86 find_library versioned test: try static library on all platforms
    53f68e1 find_library versioned test: try to get bigger again


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfb3c86d273d1c8119541645389627e9b8819098
commit cfb3c86d273d1c8119541645389627e9b8819098
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Feb 16 22:10:58 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Feb 16 22:10:58 2012 +0100

    find_library versioned test: try static library on all platforms

diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 5c533bd..ec3ad39 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -199,7 +199,9 @@ CONFIGURE_FILE(
   ${Complex_SOURCE_DIR}/Library/dummy
   ${Complex_BINARY_DIR}/Library/dummylib.lib
   COPYONLY IMMEDIATE)
-FOREACH (ext ${CMAKE_SHLIB_SUFFIX};.so;.a;.sl;${CMAKE_SHARED_LIBRARY_SUFFIX}.2)
+FOREACH (ext ${CMAKE_SHLIB_SUFFIX};.so;.a;.sl
+         ${CMAKE_SHARED_LIBRARY_SUFFIX}.2
+         ${CMAKE_STATIC_LIBRARY_SUFFIX}.2)
   CONFIGURE_FILE(
     ${Complex_SOURCE_DIR}/Library/dummy
     ${Complex_BINARY_DIR}/Library/libdummylib${ext}
@@ -216,19 +218,34 @@ FIND_LIBRARY(FIND_DUMMY_LIB
              PATHS
              ${Complex_BINARY_DIR}/Library DOC "find dummy lib")
 
+# This doesn't work for platforms that have a shared library and an import
+# library, like Windows with .dll and .lib. Limit is to ".so" now because it's
+# known to work there.
 IF(CMAKE_SHARED_LIBRARY_SUFFIX STREQUAL ".so")
-  FIND_LIBRARY(FIND_DUMMY_LIB_VERSIONED
+  FIND_LIBRARY(FIND_DUMMY_SHLIB_VERSIONED
                NAMES libdummylib${CMAKE_SHARED_LIBRARY_SUFFIX}.2
                PATHS ${Complex_BINARY_DIR}/Library
-               DOC "find versioned dummy lib"
+               DOC "find versioned dummy shared lib"
                NO_DEFAULT_PATH)
 
-  IF(NOT FIND_DUMMY_LIB_VERSIONED MATCHES "/libdummylib${CMAKE_SHARED_LIBRARY_SUFFIX}.2")
-    MESSAGE(SEND_ERROR "FIND_DUMMY_LIB_VERSIONED is not set correctly: "
-            "${FIND_DUMMY_LIB_VERSIONED}")
+  IF(NOT FIND_DUMMY_SHLIB_VERSIONED MATCHES "/libdummylib${CMAKE_SHARED_LIBRARY_SUFFIX}.2")
+    MESSAGE(SEND_ERROR "FIND_DUMMY_SHLIB_VERSIONED is not set correctly: "
+            "${FIND_DUMMY_SHLIB_VERSIONED}")
   ENDIF()
 ENDIF()
 
+# Static library, should work everywhere
+FIND_LIBRARY(FIND_DUMMY_STLIB_VERSIONED
+             NAMES libdummylib${CMAKE_STATIC_LIBRARY_SUFFIX}.2
+             PATHS ${Complex_BINARY_DIR}/Library
+             DOC "find versioned dummy static lib"
+             NO_DEFAULT_PATH)
+
+IF(NOT FIND_DUMMY_STLIB_VERSIONED MATCHES "/libdummylib${CMAKE_STATIC_LIBRARY_SUFFIX}.2")
+  MESSAGE(SEND_ERROR "FIND_DUMMY_STLIB_VERSIONED is not set correctly: "
+          "${FIND_DUMMY_STLIB_VERSIONED}")
+ENDIF()
+
 #
 # Test SET_SOURCE_FILES_PROPERTIES 
 #

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53f68e18cab6ee3e48324d795237e44f9775a803
commit 53f68e18cab6ee3e48324d795237e44f9775a803
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Feb 16 21:55:41 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Feb 16 21:55:41 2012 +0100

    find_library versioned test: try to get bigger again

diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 40de212..5c533bd 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -199,7 +199,7 @@ CONFIGURE_FILE(
   ${Complex_SOURCE_DIR}/Library/dummy
   ${Complex_BINARY_DIR}/Library/dummylib.lib
   COPYONLY IMMEDIATE)
-FOREACH (ext ${CMAKE_SHLIB_SUFFIX};.so;.a;.sl;.so.2)
+FOREACH (ext ${CMAKE_SHLIB_SUFFIX};.so;.a;.sl;${CMAKE_SHARED_LIBRARY_SUFFIX}.2)
   CONFIGURE_FILE(
     ${Complex_SOURCE_DIR}/Library/dummy
     ${Complex_BINARY_DIR}/Library/libdummylib${ext}
@@ -218,12 +218,12 @@ FIND_LIBRARY(FIND_DUMMY_LIB
 
 IF(CMAKE_SHARED_LIBRARY_SUFFIX STREQUAL ".so")
   FIND_LIBRARY(FIND_DUMMY_LIB_VERSIONED
-               NAMES libdummylib.so.2
+               NAMES libdummylib${CMAKE_SHARED_LIBRARY_SUFFIX}.2
                PATHS ${Complex_BINARY_DIR}/Library
                DOC "find versioned dummy lib"
                NO_DEFAULT_PATH)
 
-  IF(NOT FIND_DUMMY_LIB_VERSIONED MATCHES "/libdummylib.so.2")
+  IF(NOT FIND_DUMMY_LIB_VERSIONED MATCHES "/libdummylib${CMAKE_SHARED_LIBRARY_SUFFIX}.2")
     MESSAGE(SEND_ERROR "FIND_DUMMY_LIB_VERSIONED is not set correctly: "
             "${FIND_DUMMY_LIB_VERSIONED}")
   ENDIF()

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

Summary of changes:
 Tests/Complex/CMakeLists.txt |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake