summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKefu Chai <kchai@redhat.com>2016-07-29 18:26:43 +0200
committerKefu Chai <kchai@redhat.com>2016-07-29 18:26:44 +0200
commita27bbaaebf1391e41495f33d66237bcf485e332b (patch)
treec95cc3655752ec9af1b66732814a142bc4b3c0ee /src
parentcmake: cleanup Findfuse.cmake (diff)
downloadceph-a27bbaaebf1391e41495f33d66237bcf485e332b.tar.xz
ceph-a27bbaaebf1391e41495f33d66237bcf485e332b.zip
cmake: link libcommon against pthread
as Thread.cc lives in libcommon, and global is not using libpthread directly. so moving libpthread linkage from libglobal to libcommon. Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/global/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 463d0d3c2e3..5a7e6126b9f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -508,7 +508,7 @@ add_library(common STATIC ${libcommon_files}
$<TARGET_OBJECTS:common_mountcephfs_objs>)
target_link_libraries(common json_spirit erasure_code rt resolv
${Boost_LIBRARIES} ${BLKID_LIBRARIES} ${Backtrace_LIBRARIES}
- ${CRYPTO_LIBS} ${CMAKE_DL_LIBS})
+ ${CRYPTO_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
set_source_files_properties(${CMAKE_SOURCE_DIR}/src/ceph_ver.c
${CMAKE_SOURCE_DIR}/src/common/version.cc
diff --git a/src/global/CMakeLists.txt b/src/global/CMakeLists.txt
index 7cbee098d97..f9a1c264ed3 100644
--- a/src/global/CMakeLists.txt
+++ b/src/global/CMakeLists.txt
@@ -7,4 +7,4 @@ set(global_common_files
add_library(global_common_objs OBJECT ${global_common_files})
add_library(global STATIC ${libglobal_srcs}
$<TARGET_OBJECTS:global_common_objs>)
-target_link_libraries(global common ${CMAKE_THREAD_LIBS_INIT} ${EXTRALIBS})
+target_link_libraries(global common ${EXTRALIBS})