X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2FCMakeLists.txt;h=c688c7b95afc6af48bee29e9544b5eb50d320ad8;hb=7781e7d0bf9fc0d986308838a3e1e47d0df3c019;hp=6dd760d3847fa837d318b93fae5f12e0ba3f0369;hpb=30c51379a982cb3e7682a90cdb2469c5e72a6045;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/CMakeLists.txt b/src/libmemcached/CMakeLists.txt
index 6dd760d3..c688c7b9 100644
--- a/src/libmemcached/CMakeLists.txt
+++ b/src/libmemcached/CMakeLists.txt
@@ -12,8 +12,12 @@ bison_target(CSL_PARSER csl/parser.yy ${CMAKE_CURRENT_BINARY_DIR}/csl/parser.cc
         COMPILE_FLAGS ${BISON_WARNINGS}
         )
 set_source_files_properties(${BISON_CSL_PARSER_OUTPUTS} PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
+if(NOT HAVE_UNISTD_H)
+        set(FLEX_FLAGS --nounistd)
+endif()
 flex_target(CSL_SCANNER csl/scanner.l ${CMAKE_CURRENT_BINARY_DIR}/csl/scanner.cc
         DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/csl/scanner.h
+        COMPILE_FLAGS "${FLEX_FLAGS}"
         )
 set_source_files_properties(${FLEX_CSL_SCANNER_OUTPUTS} PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
 add_flex_bison_dependency(CSL_SCANNER CSL_PARSER)
@@ -24,7 +28,7 @@ set(LIBMEMCACHED_SOURCES
         ${FLEX_CSL_SCANNER_OUTPUTS}
         allocators.cc
         analyze.cc
-        array.c
+        array.cc
         auto.cc
         backtrace.cc
         behavior.cc
@@ -53,7 +57,6 @@ set(LIBMEMCACHED_SOURCES
         namespace.cc
         options.cc
         parse.cc
-        poll.cc
         purge.cc
         quit.cc
         response.cc
@@ -69,7 +72,7 @@ set(LIBMEMCACHED_SOURCES
         udp.cc
         verbosity.cc
         version.cc
-        virtual_bucket.c)
+        virtual_bucket.cc)
 
 check_cxx_compiler_flag(-Wno-deprecated-register W_NO_DEPRECATED_REGISTER)
 
@@ -88,16 +91,23 @@ 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})
+        SOVERSION ${LIBMEMCACHED_SO_VERSION})
 target_compile_definitions(libmemcached PRIVATE -DBUILDING_LIBMEMCACHED)
 target_link_libraries(libmemcached PUBLIC libhashkit Threads::Threads ${CMAKE_DL_LIBS})
+target_link_libraries(libmemcached PRIVATE p9y)
+if(MSVC)
+    target_link_libraries(libmemcached PUBLIC wsock32 ws2_32)
+endif()
 if(HAVE_BACKTRACE)
-    target_link_libraries(libmemcached PRIVATE ${BACKTRACE})
+    target_link_libraries(libmemcached PUBLIC ${BACKTRACE})
 endif()
 if(HAVE_LIBSASL)
     target_link_libraries(libmemcached PUBLIC ${LIBSASL})
 endif()
+if(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
+    # see https://docs.oracle.com/cd/E77782_01/html/E77789/bkamq.html#OSSCPgrxeu
+    target_link_libraries(libmemcached INTERFACE stdc++ gcc_s CrunG3 c)
+endif()
 target_include_directories(libmemcached PRIVATE
         ${CMAKE_SOURCE_DIR}/src
         ${CMAKE_BINARY_DIR}/src
@@ -110,9 +120,15 @@ target_include_directories(libmemcached PUBLIC
 enable_dtrace_for(libmemcached libmemcached_probes.d dtrace_probes.h)
 
 install(TARGETS libmemcached EXPORT libmemcached-targets
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        RUNTIME COMPONENT bin DESTINATION ${CMAKE_INSTALL_BINDIR}
+        ARCHIVE COMPONENT lib DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY COMPONENT lib DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ${TARGET_NAMELINK_COMPONENT}
+        )
 export(EXPORT libmemcached-targets NAMESPACE libmemcached::)
-install(EXPORT libmemcached-targets NAMESPACE libmemcached:: DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
+install(EXPORT libmemcached-targets NAMESPACE libmemcached::
+        COMPONENT dev
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
 
 install_public_headers(
         libmemcached
@@ -128,11 +144,15 @@ add_library(memcachedinternal ALIAS libmemcachedinternal)
 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 ${CMAKE_DL_LIBS})
+target_link_libraries(libmemcachedinternal PRIVATE p9y)
+if(MSVC OR MINGW)
+    target_link_libraries(libmemcached PUBLIC wsock32 ws2_32)
+endif()
 if(HAVE_LIBSASL)
     target_link_libraries(libmemcachedinternal PUBLIC ${LIBSASL})
 endif()
 if(HAVE_BACKTRACE)
-    target_link_libraries(libmemcachedinternal PRIVATE ${BACKTRACE})
+    target_link_libraries(libmemcachedinternal PUBLIC ${BACKTRACE})
 endif()
 target_include_directories(libmemcachedinternal PRIVATE
         ${CMAKE_SOURCE_DIR}/src