From: John David Duncan Date: September 20 2011 6:34pm Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3509 to 3510) List-Archive: http://lists.mysql.com/commits/141041 Message-Id: <201109201834.p8KIYjng004662@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 3509 John David Duncan 2011-09-20 memcached links with libdl modified: extra/memcached/CMakeLists.txt === modified file 'extra/libevent/CMakeLists.txt' --- a/extra/libevent/CMakeLists.txt 2011-09-20 15:22:11 +0000 +++ b/extra/libevent/CMakeLists.txt 2011-09-20 18:33:33 +0000 @@ -81,3 +81,7 @@ ADD_LIBRARY(event STATIC ${LIBEVENT_CORE ${LIBEVENT_EVPORT_SOURCES} ${LIBEVENT_KQUEUE_SOURCES}) +if(LIBRT) + target_link_libraries(event rt) +endif() + === modified file 'extra/memcached/CMakeLists.txt' --- a/extra/memcached/CMakeLists.txt 2011-09-20 18:00:44 +0000 +++ b/extra/memcached/CMakeLists.txt 2011-09-20 18:33:33 +0000 @@ -60,7 +60,12 @@ SET(MEMCACHED_SOURCES add_executable(memcached ${MEMCACHED_SOURCES}) -target_link_libraries(memcached event memcached_utilities m dl) +target_link_libraries(memcached event memcached_utilities dl) + +if(LIBM) + target_link_libraries(memcached m) +endif() + CHECK_INCLUDE_FILE("link.h" HAVE_LINK_H) CHECK_INCLUDE_FILE("stdbool.h" HAVE_STDBOOL_H) No bundle (reason: useless for push emails).