X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2FCMakeLists.txt;h=2c1e61ac562a34eaac28f073e92052f2288391f3;hb=e192f12a5dcf9e3a4bec8660f027ade52dc222c4;hp=6ed96a88bc7208bc1d989c99f1fdf69a378802b0;hpb=0e1198064e6f95724d7bc92cc9ef14eb8a37e245;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/CMakeLists.txt b/src/libmemcached/CMakeLists.txt
index 6ed96a88..2c1e61ac 100644
--- a/src/libmemcached/CMakeLists.txt
+++ b/src/libmemcached/CMakeLists.txt
@@ -85,21 +85,19 @@ add_library(libmemcached SHARED
         ${LIBMEMCACHED_SOURCES})
 add_library(memcached ALIAS libmemcached)
 set_target_properties(libmemcached PROPERTIES
+        CXX_STANDARD ${CXX_STANDARD}
         LIBRARY_OUTPUT_NAME memcached
         LIBRARY_OUTPUT_NAME_DEBUG memcached-dbg
         SOVERSION ${LIBMEMCACHED_SO_VERSION}
         VERSION v${LIBMEMCACHED_VERSION})
 target_compile_definitions(libmemcached PRIVATE -DBUILDING_LIBMEMCACHED)
-target_link_libraries(libmemcached PUBLIC libhashkit Threads::Threads ${LIBSASL_LIBRARIES} ${CMAKE_DL_LIBS} ${Backtrace_LIBRARIES})
-if(LIBSASL_FOUND)
-    if(PKG_CONFIG_FOUND)
-        target_link_libraries(libmemcached PUBLIC PkgConfig::LIBSASL)
-    else()
-        target_link_libraries(libmemcached PUBLIC ${LIBSASL_LIBRARIES})
-        target_include_directories(libmemcached PUBLIC ${LIBSASL_INCLUDEDIR})
-    endif()
+target_link_libraries(libmemcached PUBLIC libhashkit Threads::Threads ${CMAKE_DL_LIBS})
+if(HAVE_BACKTRACE)
+    target_link_libraries(libmemcached PUBLIC ${BACKTRACE})
+endif()
+if(HAVE_LIBSASL)
+    target_link_libraries(libmemcached PUBLIC ${LIBSASL})
 endif()
-target_include_directories(libmemcached PRIVATE ${Backtrace_INCLUDE_DIR})
 target_include_directories(libmemcached PRIVATE
         ${CMAKE_SOURCE_DIR}/src
         ${CMAKE_BINARY_DIR}/src
@@ -127,15 +125,19 @@ install_public_headers(
 add_library(libmemcachedinternal STATIC
         ${LIBMEMCACHED_SOURCES})
 add_library(memcachedinternal ALIAS libmemcachedinternal)
-set_target_properties(libmemcachedinternal PROPERTIES LIBRARY_OUTPUT_NAME memcachedinternal)
+set_target_properties(libmemcachedinternal PROPERTIES CXX_STANDARD ${CXX_STANDARD} LIBRARY_OUTPUT_NAME memcachedinternal)
 target_compile_definitions(libmemcachedinternal PRIVATE -DBUILDING_LIBMEMCACHEDINTERNAL)
-target_link_libraries(libmemcachedinternal PUBLIC libhashkit Threads::Threads ${LIBSASL_LIBRARIES} ${CMAKE_DL_LIBS} ${Backtrace_LIBRARIES})
-target_include_directories(libmemcachedinternal PRIVATE ${Backtrace_INCLUDE_DIR})
+target_link_libraries(libmemcachedinternal PUBLIC libhashkit Threads::Threads ${CMAKE_DL_LIBS})
+if(HAVE_LIBSASL)
+    target_link_libraries(libmemcachedinternal PUBLIC ${LIBSASL})
+endif()
+if(HAVE_BACKTRACE)
+    target_link_libraries(libmemcachedinternal PUBLIC ${BACKTRACE})
+endif()
 target_include_directories(libmemcachedinternal PRIVATE
         ${CMAKE_SOURCE_DIR}/src
         ${CMAKE_BINARY_DIR}/src
         ${CMAKE_BINARY_DIR})
-target_include_directories(libmemcachedinternal PUBLIC ${LIBSASL_INCLUDEDIR})
 target_include_directories(libmemcachedinternal PUBLIC
         $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
         $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>