]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: add common_utf8 lib to link unittest_str_map 4601/head
authorOrit Wasserman <owasserm@redhat.com>
Thu, 7 May 2015 09:01:45 +0000 (11:01 +0200)
committerOrit Wasserman <owasserm@redhat.com>
Fri, 8 May 2015 08:59:42 +0000 (10:59 +0200)
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/CMakeLists.txt
src/test/CMakeLists.txt

index 973deab0c1f23bc14afee0c5af7864bb04edbd28..f075a85d499f6c5a90513c2f47b3117bb54a05f7 100644 (file)
@@ -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
index 6a6f4af01e625a70e3a66c649d75a18fd4eb91fa..6154865294f50da99478381df2d43630c5bd949e 100644 (file)
@@ -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})