From: Orit Wasserman <owasserm@redhat.com>
Date: Thu, 7 May 2015 09:01:45 +0000 (+0200)
Subject: cmake: add common_utf8 lib to link unittest_str_map
X-Git-Tag: v9.0.2~209^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4601%2Fhead;p=ceph.git

cmake: add common_utf8 lib to link unittest_str_map

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 973deab0c1f2..f075a85d499f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -291,7 +291,9 @@ if(${WITH_PROFILER})
   target_link_libraries(common profiler)
 endif(${WITH_PROFILER})
 
-target_link_libraries( common json_spirit erasure_code rt uuid ${CRYPTO_LIBS} ${Boost_LIBRARIES})
+add_library(common_utf8 STATIC common/utf8.c)
+
+target_link_libraries( common json_spirit common_utf8 erasure_code rt uuid ${CRYPTO_LIBS} ${Boost_LIBRARIES})
 
 set(libglobal_srcs
   global/global_init.cc
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 6a6f4af01e62..6154865294f5 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -400,8 +400,8 @@ add_executable(unittest_str_map
   ${unittest_str_map_srcs}
   $<TARGET_OBJECTS:heap_profiler_objs>
   )
-target_link_libraries(unittest_str_map global
-  ${CMAKE_DL_LIBS} ${TCMALLOC_LIBS} ${UNITTEST_LIBS})
+target_link_libraries(unittest_str_map common global
+  ${CMAKE_DL_LIBS} ${TCMALLOC_LIBS} ${UNITTEST_LIBS} common)
 set_target_properties(unittest_str_map
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})