Skip to content

Commit

Permalink
src/CmakeLists.txt: conditionalize krbd and parse_secret
Browse files Browse the repository at this point in the history
 - krbd is the Linux Kernel driver, which will probably never be portable
   to FreeBSD is this form.
 - RBD is (not yet) ported to FreeBSD, but the option is there
   So carefully conditionalize on that
 - keyutils is not available on FreeBSD, and a replacement needs to be
   written. Until then execlude code pased on that.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
  • Loading branch information
wjwithagen committed Aug 1, 2016
1 parent 8470d51 commit c31f58e
Showing 1 changed file with 14 additions and 21 deletions.
35 changes: 14 additions & 21 deletions src/CMakeLists.txt
Expand Up @@ -555,21 +555,6 @@ 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 Expand Up @@ -617,11 +602,9 @@ endif()

set(dencoder_srcs
test/encoding/ceph_dencoder.cc
$<TARGET_OBJECTS:krbd_objs>
$<TARGET_OBJECTS:parse_secret_objs>
$<TARGET_OBJECTS:common_texttable_obj>
)
if(${WITH_RADOSGW})
if(WITH_RADOSGW)
list(APPEND dencoder_srcs
rgw/rgw_dencoder.cc
)
Expand All @@ -637,12 +620,22 @@ if(${WITH_RADOSGW})
${CURL_LIBRARIES}
${EXPAT_LIBRARIES}
)
endif(${WITH_RADOSGW})
if(${WITH_RBD})
endif(WITH_RADOSGW)
if(WITH_RBD)
set(DENCODER_EXTRALIBS
${DENCODER_EXTRALIBS}
rbd_replay_types)
endif(${WITH_RBD})
if(LINUX)
list(APPEND dencoder_srcs
$<TARGET_OBJECTS:krbd_objs>)
endif(LINUX)
endif(WITH_RBD)
if(WITH_KVS)
list(APPEND dencoder_srcs
$<TARGET_OBJECTS:parse_secret_objs>)
endif(WITH_KVS)



add_executable(ceph-dencoder ${dencoder_srcs})
target_link_libraries(ceph-dencoder
Expand Down

0 comments on commit c31f58e

Please sign in to comment.