List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:April 23 2012 2:19pm
Subject:bzr push into mysql-5.5 branch (Georgi.Kodinov:3806 to 3807)
View as plain text  
 3807 Georgi Kodinov	2012-04-23
      Fixed a cmake compile problem because of the 2.8.8 fix.

    modified:
      configure.cmake
 3806 Georgi Kodinov	2012-04-23
      Bug #59148 - made tests experimental
      Fixed a cmake 2.8.8 compilation problem.

    modified:
      configure.cmake
=== modified file 'configure.cmake'
--- a/configure.cmake	2012-04-23 13:26:22 +0000
+++ b/configure.cmake	2012-04-23 14:18:55 +0000
@@ -149,8 +149,9 @@ IF(UNIX)
   SET(CMAKE_REQUIRED_LIBRARIES 
     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
 
-  IF(NOT ${CMAKE_REQUIRED_LIBRARIES} MATCHES '')
-    LIST(REMOVE_DUPLICATES ${CMAKE_REQUIRED_LIBRARIES})
+  LIST(LENGTH CMAKE_REQUIRED_LIBRARIES required_libs_length)
+  IF(${required_libs_length} GREATER 0)
+    LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
   ENDIF()  
   LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
   

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (Georgi.Kodinov:3806 to 3807) Georgi Kodinov23 Apr