cmake: improve dependency checks

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

diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index 0894b24704dc65a3693958da5626e1ea8ac4844d..988f4809a21806109e6916948aa15511aa5fce99 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_target_properties(${CLIENT} PROPERTIES CXX_STANDARD ${CXX_STANDARD})
     target_include_directories(${CLIENT} PRIVATE ..)
     target_link_libraries(${CLIENT} PRIVATE libclient_common)
     if(CMAKE_INSTALL_RPATH)
@@ -24,22 +25,20 @@ target_link_libraries(memslap PRIVATE Threads::Threads)
 
 # memaslap is special
 
-if(ENABLE_MEMASLAP)
-    if(LIBEVENT AND HAVE_C_STDATOMIC)
-        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})
+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 LIBEVENT)
+    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()