bin: move memaslap to contrib

[m6w6/libmemcached] / src / bin / CMakeLists.txt

diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index c6e11b4d166a4f82705de47589ce9b9d880edf82..0dea2a8839043160f04feae14404b32848ad87e2 100644 (file)
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -2,6 +2,7 @@ add_subdirectory(common)
 
 foreach(CLIENT IN LISTS CLIENTS)
     add_executable(${CLIENT} ${CLIENT}.cc)
+    set_property(TARGET ${CLIENT} PROPERTY CXX_STANDARD ${CXX_STANDARD})
     target_include_directories(${CLIENT} PRIVATE ..)
     target_link_libraries(${CLIENT} PRIVATE libclient_common)
     if(CMAKE_INSTALL_RPATH)
@@ -22,28 +23,6 @@ target_link_libraries(memcapable PRIVATE Threads::Threads)
 target_link_libraries(memping PRIVATE libmemcachedutil)
 target_link_libraries(memslap PRIVATE Threads::Threads)
 
-# memaslap is special
+# contrib
 
-if(HAVE_MEMASLAP)
-    add_executable(memaslap memaslap.c
-            memaslap/ms_conn.c
-            memaslap/ms_setting.c
-            memaslap/ms_sigsegv.c
-            memaslap/ms_stats.c
-            memaslap/ms_task.c
-            memaslap/ms_thread.c)
-    target_include_directories(memaslap PRIVATE memaslap)
-    target_link_libraries(memaslap PRIVATE libclient_common Threads::Threads)
-    if(PKG_CONFIG_FOUND)
-        target_link_libraries(memaslap PRIVATE PkgConfig::LIBEVENT)
-    else()
-        target_include_directories(memaslap PRIVATE ${LIBEVENT_INCLUDEDIR})
-        target_link_libraries(memaslap PRIVATE ${LIBEVENT_LIBRARIES})
-    endif()
-    if(CMAKE_INSTALL_RPATH)
-        set_target_properties(${CLIENT} PROPERTIES
-                INSTALL_RPATH ${CMAKE_INSTALL_RPATH}/../${CMAKE_INSTALL_LIBDIR})
-    endif()
-    install(TARGETS memaslap
-            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
+add_subdirectory(contrib)