Skip to content

Commit

Permalink
src/CmakeLists.txt: Changes Linux type include libraries
Browse files Browse the repository at this point in the history
 - On FreeBSD libuuid, libresolv, libdl are all in libc.
   So do not use them while linking, otherwise missing lib errors
   will result
 - UUID seems not to be used on Linux either, so remove that as a whole.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
  • Loading branch information
wjwithagen committed Aug 1, 2016
1 parent a1d9199 commit 9e05d20
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion src/CMakeLists.txt
Expand Up @@ -217,8 +217,11 @@ else(INTEL_SSE4_1)
message(STATUS "Skipping target ec_jerasure_sse4 & ec_shec_sse4: -msse4.1 not supported")
endif(INTEL_SSE4_1)


set(EXTRALIBS rt ${CMAKE_DL_LIBS} ${ATOMIC_OPS_LIBRARIES})
if(LINUX)
set(LIB_RESOLV resolv)
list(APPEND EXTRALIBS ${LIB_RESOLV})
endif(LINUX)

option(WITH_PROFILER "build extra profiler binaries" OFF)
if(WITH_PROFILER)
Expand Down Expand Up @@ -551,6 +554,21 @@ endif(HAVE_ARMV8_CRC)

add_library(common_utf8 STATIC common/utf8.c)

<<<<<<< 64564d7b5367df64622d693180a21d07c33e4262
=======
target_link_libraries(common
json_spirit
common_utf8
erasure_code
rt
${LIB_RESOLV}
${CRYPTO_LIBS}
${Boost_LIBRARIES}
${BLKID_LIBRARIES}
${Backtrace_LIBRARIES}
)

>>>>>>> src/CmakeLists.txt: Changes Linux type include libraries
if(${WITH_LTTNG})
add_subdirectory(tracing)
endif(${WITH_LTTNG})
Expand Down

0 comments on commit 9e05d20

Please sign in to comment.