Merge pull request log4cplus#660 from wilx/master

Use target_link_libraries with PRIVATE keyword. Fixes log4cplus#659.

Author: wilx

CMakeLists.txt

@@ -25,6 +25,8 @@ set (CMAKE_POSITION_INDEPENDENT_CODE ON)
 set (CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON)
 set (CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO ON)
 set (CMAKE_INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL ON)
+# Hint to prefer -pthread over -lpthread
+set (THREADS_PREFER_PTHREAD_FLAG ON)
 
 enable_language (CXX)
 if (MSVC)
@@ -61,11 +63,11 @@ endif(LOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION)
 
 option(LOG4CPLUS_ENABLE_THREAD_POOL "Instantiate internal thread pool for when AsyncAppend=true" ON)
 if (LOG4CPLUS_ENABLE_THREAD_POOL)
-add_compile_definitions (LOG4CPLUS_ENABLE_THREAD_POOL=1)
+  add_compile_definitions (LOG4CPLUS_ENABLE_THREAD_POOL=1)
 endif()
 
 if(NOT LOG4CPLUS_SINGLE_THREADED)
-  find_package (Threads)
+  find_package (Threads REQUIRED)
   message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}")
 endif(NOT LOG4CPLUS_SINGLE_THREADED)
 

simpleserver/CMakeLists.txt

@@ -10,6 +10,6 @@ if (UNICODE)
   target_compile_definitions (${loggingserver} PUBLIC _UNICODE)
   add_definitions (-UMBCS -U_MBCS)
 endif (UNICODE)
-target_link_libraries (${loggingserver} ${log4cplus})
+target_link_libraries (${loggingserver} PUBLIC ${log4cplus})
 
 install(TARGETS ${loggingserver} DESTINATION ${CMAKE_INSTALL_BINDIR})

src/CMakeLists.txt

@@ -105,29 +105,31 @@ if (UNICODE)
   add_definitions (-UMBCS -U_MBCS)
 endif (UNICODE)
 
-set (log4cplus_LIBS ${CMAKE_THREAD_LIBS_INIT})
+if (NOT LOG4CPLUS_SINGLE_THREADED)
+  target_link_libraries (${log4cplus} PRIVATE Threads::Threads)
+endif ()
+
 if (LIBRT)
-  list (APPEND log4cplus_LIBS ${LIBRT})
+  target_link_libraries (${log4cplus} PRIVATE ${LIBRT})
 endif ()
 if (LIBPOSIX4)
-  list (APPEND log4cplus_LIBS ${LIBPOSIX4})
+  target_link_libraries (${log4cplus} PRIVATE ${LIBPOSIX4})
 endif ()
 if (LIBCPOSIX)
-  list (APPEND log4cplus_LIBS ${LIBCPOSIX})
+  target_link_libraries (${log4cplus} PRIVATE ${LIBCPOSIX})
 endif ()
 if (LIBSOCKET)
-  list (APPEND log4cplus_LIBS ${LIBSOCKET})
+  target_link_libraries (${log4cplus} PRIVATE ${LIBSOCKET})
 endif ()
 if (LIBNSL)
-  list (APPEND log4cplus_LIBS ${LIBNSL})
+  target_link_libraries (${log4cplus} PRIVATE ${LIBNSL})
 endif ()
 if (LOG4CPLUS_WITH_ICONV AND LIBICONV)
-  list (APPEND log4cplus_LIBS ${LIBICONV})
+  target_link_libraries (${log4cplus} PRIVATE ${LIBICONV})
 endif ()
 if (ANDROID AND WITH_UNIT_TESTS)
-  list (APPEND log4cplus_LIBS ${ANDROID_LOG_LIB})
+  target_link_libraries (${log4cplus} PRIVATE ${ANDROID_LOG_LIB})
 endif ()
-target_link_libraries (${log4cplus} ${log4cplus_LIBS})
 
 if (ANDROID)
   # Android does not seem to have SO version support.
@@ -155,7 +157,8 @@ endif ()
 if (WIN32)
   set_target_properties (${log4cplus} PROPERTIES
     DEBUG_POSTFIX "D")
-  target_link_libraries (${log4cplus} ws2_32 advapi32)
+  target_link_libraries (${log4cplus} PRIVATE ws2_32)
+  target_link_libraries (${log4cplus} PRIVATE advapi32)
 endif ()
 
 ###