Commit be34a0d4 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

[t:4871] fixing linking of portability and ydb layer with external things

git-svn-id: file:///svn/toku/tokudb@44509 c7de825b-a66e-492c-adef-691d508d4ae1
parent 36dc39a0
...@@ -15,7 +15,7 @@ add_library(${LIBTOKUPORTABILITY}_static STATIC ${tokuportability_srcs}) ...@@ -15,7 +15,7 @@ add_library(${LIBTOKUPORTABILITY}_static STATIC ${tokuportability_srcs})
maybe_add_gcov_to_libraries(${LIBTOKUPORTABILITY} ${LIBTOKUPORTABILITY}_static) maybe_add_gcov_to_libraries(${LIBTOKUPORTABILITY} ${LIBTOKUPORTABILITY}_static)
set_property(TARGET ${LIBTOKUPORTABILITY} ${LIBTOKUPORTABILITY}_static APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE) set_property(TARGET ${LIBTOKUPORTABILITY} ${LIBTOKUPORTABILITY}_static APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE)
add_space_separated_property(TARGET ${LIBTOKUPORTABILITY}_static COMPILE_FLAGS -fPIC) add_space_separated_property(TARGET ${LIBTOKUPORTABILITY}_static COMPILE_FLAGS -fPIC)
target_link_libraries(${LIBTOKUPORTABILITY} LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} dl) target_link_libraries(${LIBTOKUPORTABILITY} LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} dl)
if (CMAKE_C_COMPILER_ID STREQUAL Intel) if (CMAKE_C_COMPILER_ID STREQUAL Intel)
## ignore warning about cilkrts linking dynamically ## ignore warning about cilkrts linking dynamically
......
...@@ -22,7 +22,7 @@ set(tokudb_srcs ...@@ -22,7 +22,7 @@ set(tokudb_srcs
add_library(${LIBTOKUDB} SHARED ${tokudb_srcs}) add_library(${LIBTOKUDB} SHARED ${tokudb_srcs})
add_dependencies(${LIBTOKUDB} install_tdb_h) add_dependencies(${LIBTOKUDB} install_tdb_h)
target_link_libraries(${LIBTOKUDB} LINK_PRIVATE lock_tree_static range_tree_static ft_static) target_link_libraries(${LIBTOKUDB} LINK_PRIVATE lock_tree_static range_tree_static ft_static)
target_link_libraries(${LIBTOKUDB} LINK_INTERFACE_LIBRARIES ${ZLIB_LIBRARIES}) target_link_libraries(${LIBTOKUDB} LINK_PUBLIC ${ZLIB_LIBRARIES})
## make the static library ## make the static library
add_library(${LIBTOKUDB}_static STATIC ${tokudb_srcs}) add_library(${LIBTOKUDB}_static STATIC ${tokudb_srcs})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment