[Cmake-commits] CMake branch, next, updated. v2.8.7-2622-gfd1e615

[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  fd1e615063d36571be7c59345b66b5752555ba06 (commit)
       via  5f721e9ec8e8f84ee08b8e950a3b80425d14bf66 (commit)
      from  6d1de03ade6f3d6006c33e05ffadf65ba677b3cb (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=fd1e615063d36571be7c59345b66b5752555ba06
commit fd1e615063d36571be7c59345b66b5752555ba06
Merge: 6d1de03 5f721e9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 15 15:20:46 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 15 15:20:46 2012 -0500

    Merge topic 'findlibrary-versioned-libraries' into next
    
    5f721e9 fix test for versioned libraries


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

    fix test for versioned libraries

diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 3e716cf..4a693ed 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}
@@ -217,11 +217,16 @@ FIND_LIBRARY(FIND_DUMMY_LIB
              ${Complex_BINARY_DIR}/Library DOC "find dummy lib")
 
 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${CMAKE_SHARED_LIBRARY_SUFFIX}.2")
+  MESSAGE(SEND_ERROR "FIND_DUMMY_LIB_VERSIONED is not set correctly: "
+          "${FIND_DUMMY_LIB_VERSIONED}")
+ENDIF()
+
 #
 # Test SET_SOURCE_FILES_PROPERTIES 
 #
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx
index e6a9fb3..1901d99 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -849,23 +849,6 @@ int main()
     }
 #endif
 
-#ifndef FIND_DUMMY_LIB_VERSIONED
-  cmFailed("the CONFIGURE_FILE command is broken, "
-         "FIND_DUMMY_LIB_VERSIONED is not defined.");
-#else
-  const char *libmatch = strstr(FIND_DUMMY_LIB_VERSIONED,
-                                "/libdummylib.so.2");
-  if(libmatch == NULL || strlen(libmatch) != strlen("/libdummylib.so.2"))
-    {
-    cmFailed("the FIND_LIBRARY or CONFIGURE_FILE command is broken, "
-           "FIND_DUMMY_LIB_VERSIONED == ", FIND_DUMMY_LIB_VERSIONED);
-    }
-  else
-    {
-    cmPassed("FIND_DUMMY_LIB_VERSIONED == ", FIND_DUMMY_LIB_VERSIONED);
-    }
-#endif
-
   // ----------------------------------------------------------------------
   // Test SET_SOURCE_FILES_PROPERTIES
 
diff --git a/Tests/Complex/cmTestConfigure.h.in b/Tests/Complex/cmTestConfigure.h.in
index 03cf3dc..7741b6f 100644
--- a/Tests/Complex/cmTestConfigure.h.in
+++ b/Tests/Complex/cmTestConfigure.h.in
@@ -48,7 +48,6 @@
 // Test FIND_LIBRARY
 
 #define FIND_DUMMY_LIB "${FIND_DUMMY_LIB}"
-#define FIND_DUMMY_LIB_VERSIONED "${FIND_DUMMY_LIB_VERSIONED}"
 
 // Test SET_SOURCE_FILES_PROPERTIES
 

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

Summary of changes:
 Tests/Complex/CMakeLists.txt         |    9 +++++++--
 Tests/Complex/Executable/complex.cxx |   17 -----------------
 Tests/Complex/cmTestConfigure.h.in   |    1 -
 3 files changed, 7 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
CMake