List:Commits« Previous MessageNext Message »
From:John David Duncan Date:September 20 2011 7:46pm
Subject:bzr push into mysql-5.5-cluster branch (john.duncan:3510 to 3511)
View as plain text  
 3511 John David Duncan	2011-09-20
      More linker fixes

    modified:
      extra/libevent/CMakeLists.txt
      extra/memcached/CMakeLists.txt
 3510 John David Duncan	2011-09-20
      libevent links with librt on some platforms (for clock_gettime)

    modified:
      extra/libevent/CMakeLists.txt
      extra/memcached/CMakeLists.txt
=== modified file 'extra/libevent/CMakeLists.txt'
--- a/extra/libevent/CMakeLists.txt	2011-09-20 18:33:33 +0000
+++ b/extra/libevent/CMakeLists.txt	2011-09-20 19:08:56 +0000
@@ -71,7 +71,8 @@ IF(HAVE_WORKING_KQUEUE)
         SET(LIBEVENT_KQUEUE_SOURCES kqueue.c)
 ENDIF()
 
-ADD_LIBRARY(event STATIC ${LIBEVENT_CORE_SOURCES} 
+ADD_CONVENIENCE_LIBRARY(event 
+                         ${LIBEVENT_CORE_SOURCES} 
                          ${LIBEVENT_EXTRA_SOURCES} 
                          ${LIBEVENT_SIGNAL_SOURCES} 
                          ${LIBEVENT_POLL_SOURCES} 

=== modified file 'extra/memcached/CMakeLists.txt'
--- a/extra/memcached/CMakeLists.txt	2011-09-20 18:33:33 +0000
+++ b/extra/memcached/CMakeLists.txt	2011-09-20 19:08:56 +0000
@@ -38,7 +38,7 @@ SET(LIBMEMCACHED_UTILITIES_SOURCES
                 utilities/genhash_int.h
                 utilities/util.c)
 
-ADD_LIBRARY(memcached_utilities STATIC ${LIBMEMCACHED_UTILITIES_SOURCES})
+ADD_CONVENIENCE_LIBRARY(memcached_utilities ${LIBMEMCACHED_UTILITIES_SOURCES})
 
 
 SET(MEMCACHED_SOURCES
@@ -60,7 +60,11 @@ SET(MEMCACHED_SOURCES
 
 add_executable(memcached ${MEMCACHED_SOURCES})
 
-target_link_libraries(memcached event memcached_utilities dl)
+target_link_libraries(memcached event memcached_utilities)
+
+if(LIBDL)
+  target_link_libraries(memcached dl)
+endif()
 
 if(LIBM) 
   target_link_libraries(memcached m)

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (john.duncan:3510 to 3511) John David Duncan22 Sep