[Cmake-commits] CMake branch, next, updated. v2.8.7-2626-g6167eed

[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  6167eedd70e5a97b60194ca16d5e3dd344824662 (commit)
       via  6561354c9e09c7742b4e7b805e623f9d884b99e0 (commit)
      from  4522f27fc3845319342b09dbb48677792485ad57 (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=6167eedd70e5a97b60194ca16d5e3dd344824662
commit 6167eedd70e5a97b60194ca16d5e3dd344824662
Merge: 4522f27 6561354
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 15 15:37:53 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 15 15:37:53 2012 -0500

    Merge topic 'findlibrary-versioned-libraries' into next
    
    6561354 next try for versioned find_library test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6561354c9e09c7742b4e7b805e623f9d884b99e0
commit 6561354c9e09c7742b4e7b805e623f9d884b99e0
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 15 21:37:41 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Feb 15 21:37:41 2012 +0100

    next try for versioned find_library test

diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 4a693ed..518b475 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;${CMAKE_SHARED_LIBRARY_SUFFIX}.2)
+FOREACH (ext ${CMAKE_SHLIB_SUFFIX};.so;.a;.sl;so.2)
   CONFIGURE_FILE(
     ${Complex_SOURCE_DIR}/Library/dummy
     ${Complex_BINARY_DIR}/Library/libdummylib${ext}
@@ -216,15 +216,17 @@ FIND_LIBRARY(FIND_DUMMY_LIB
              PATHS
              ${Complex_BINARY_DIR}/Library DOC "find dummy lib")
 
-FIND_LIBRARY(FIND_DUMMY_LIB_VERSIONED
-             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${CMAKE_SHARED_LIBRARY_SUFFIX}.2")
-  MESSAGE(SEND_ERROR "FIND_DUMMY_LIB_VERSIONED is not set correctly: "
-          "${FIND_DUMMY_LIB_VERSIONED}")
+IF(CMAKE_SHARED_LIBRARY_SUFFIX STREQUAL ".so")
+  FIND_LIBRARY(FIND_DUMMY_LIB_VERSIONED
+               NAMES libdummylib.so.2
+               PATHS ${Complex_BINARY_DIR}/Library
+               DOC "find versioned dummy lib"
+               NO_DEFAULT_PATH)
+
+  IF(NOT FIND_DUMMY_LIB_VERSIONED MATCHES "/libdummylib.so.2")
+    MESSAGE(SEND_ERROR "FIND_DUMMY_LIB_VERSIONED is not set correctly: "
+            "${FIND_DUMMY_LIB_VERSIONED}")
+  ENDIF()
 ENDIF()
 
 #

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

Summary of changes:
 Tests/Complex/CMakeLists.txt |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake