X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2FCMakeLists.txt;h=d28d821c3feac0c814419c121727ba233e20a77d;hb=b5e8dee5607dacd95d3683a708b03fac5017ae84;hp=a8d79732c351c9750329dd8ec0295f79ed51e301;hpb=7883b530881983213dffaa6c71ace9204bedb82a;p=m6w6%2Flibmemcached

diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index a8d79732..d28d821c 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -2,14 +2,14 @@ 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)
         set_target_properties(${CLIENT} PROPERTIES
                 INSTALL_RPATH ${CMAKE_INSTALL_RPATH}/../${CMAKE_INSTALL_LIBDIR})
     endif()
-    install(TARGETS ${CLIENT}
-            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+    install(TARGETS ${CLIENT} RUNTIME COMPONENT bin DESTINATION ${CMAKE_INSTALL_BINDIR})
 endforeach()
 
 # extra sources
@@ -18,26 +18,5 @@ target_sources(memcapable PRIVATE ../libmemcached/byteorder.cc)
 
 # extra libs
 
-target_link_libraries(memcapable PRIVATE Threads::Threads)
 target_link_libraries(memping PRIVATE libmemcachedutil)
 target_link_libraries(memslap PRIVATE Threads::Threads)
-
-# memaslap is special
-
-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 ${LIBEVENT_INCLUDEDIR})
-    target_link_libraries(memaslap PRIVATE libclient_common ${LIBEVENT_LIBRARIES} Threads::Threads)
-    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()