RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 19:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: compile crimson-auth with crimson::cflags

Browse Source 
* move auth related stuff into crimson/CMakeLists.txt, so we can
  link them against crimson::cflags, which populates the necessary
  definitions and other cxx flags when building these source files.
* expose crimson::cflags as a public library of crimson, as
  crimson-osd links against crimson. and the cflags should be populated
  to crimson-osd, otherwise they are compiled with different compiler
  options.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2020-02-14 13:58:32 +08:00
parent cfa1d72c61
commit 812f10ffad
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/auth/CMakeLists.txt
View File

@ -21,10 +21,3 @@ if(HAVE_GSSAPI)
endif()
add_library(common-auth-objs OBJECT ${auth_srcs})
if(WITH_SEASTAR)
add_library(crimson-auth OBJECT ${auth_srcs})
target_compile_definitions(crimson-auth PRIVATE
"WITH_SEASTAR=1")
target_include_directories(crimson-auth PRIVATE
$<TARGET_PROPERTY:Seastar::seastar,INTERFACE_INCLUDE_DIRECTORIES>)
endif()

17
src/crimson/CMakeLists.txt
View File

@ -103,7 +103,6 @@ add_library(crimson-common STATIC
${PROJECT_SOURCE_DIR}/src/osd/OSDMap.cc
${PROJECT_SOURCE_DIR}/src/osd/PGPeeringEvent.cc
${crimson_common_srcs}
$<TARGET_OBJECTS:crimson-auth>
$<TARGET_OBJECTS:common_mountcephfs_objs>
$<TARGET_OBJECTS:crimson-crush>)
@ -123,14 +122,26 @@ endif()
target_link_libraries(crimson-common
PUBLIC
json_spirit
crimson::cflags
PRIVATE
crc32
crimson::cflags
${crimson_common_deps}
OpenSSL::Crypto)
set(crimson_auth_srcs
auth/KeyRing.cc)
auth/KeyRing.cc
${PROJECT_SOURCE_DIR}/src/auth/AuthClientHandler.cc
${PROJECT_SOURCE_DIR}/src/auth/AuthMethodList.cc
${PROJECT_SOURCE_DIR}/src/auth/AuthRegistry.cc
${PROJECT_SOURCE_DIR}/src/auth/AuthSessionHandler.cc
${PROJECT_SOURCE_DIR}/src/auth/Crypto.cc
${PROJECT_SOURCE_DIR}/src/auth/KeyRing.cc
${PROJECT_SOURCE_DIR}/src/auth/RotatingKeyRing.cc
${PROJECT_SOURCE_DIR}/src/auth/cephx/CephxAuthorizeHandler.cc
${PROJECT_SOURCE_DIR}/src/auth/cephx/CephxClientHandler.cc
${PROJECT_SOURCE_DIR}/src/auth/cephx/CephxProtocol.cc
${PROJECT_SOURCE_DIR}/src/auth/cephx/CephxSessionHandler.cc
${PROJECT_SOURCE_DIR}/src/auth/none/AuthNoneAuthorizeHandler.cc)
set(crimson_mgr_srcs
mgr/client.cc)
set(crimson_mon_srcs