Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[irods/irods#5479] Port krb plugin to new framework (main) #54

Merged
merged 2 commits into from
May 7, 2022
Merged

[irods/irods#5479] Port krb plugin to new framework (main) #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d7dcbc
[irods/irods#5479] Move legacy plugin to separate dir
alanking Apr 28, 2022
231c014
[irods/irods#5479] Port krb plugin to new framework
alanking Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
98 changes: 59 additions & 39 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR) #CPACK_DEBIAN_<COMPONENT>_PACKAGE_NAME
cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR) #CPACK_DEBIAN_<COMPONENT>_PACKAGE_NAME

find_package(IRODS REQUIRED)
set(IRODS_PLUGIN_REVISION "0")
Expand Down Expand Up @@ -55,7 +55,22 @@ find_package(OpenSSL REQUIRED)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
find_package(GSS REQUIRED)

set(PLUGIN krb)
set(
IRODS_AUTH_PLUGIN_irods_auth_plugin-krb_SOURCES
${CMAKE_SOURCE_DIR}/auth/src/krb.cpp
)

set(
IRODS_AUTH_PLUGIN_krb_SOURCES
${CMAKE_SOURCE_DIR}/auth_legacy/src/krb.cpp
)

set(
IRODS_AUTH_PLUGINS
krb
irods_auth_plugin-krb
)

set(
IRODS_PLUGIN_COMPILE_DEFINITIONS_client
)
Expand All @@ -72,49 +87,54 @@ set(
IRODS_PLUGIN_LINK_LIBRARIES_server
irods_server
)

set(
IRODS_PLUGIN_TYPES
client
server
)

foreach(TYPE ${IRODS_PLUGIN_TYPES})
set(IRODS_CURRENT_PLUGIN_TARGET ${PLUGIN}_${TYPE})
add_library(
${IRODS_CURRENT_PLUGIN_TARGET}
MODULE
${CMAKE_SOURCE_DIR}/krb/libkrb.cpp
)
target_include_directories(
${IRODS_CURRENT_PLUGIN_TARGET}
PRIVATE
${IRODS_INCLUDE_DIRS}
${IRODS_EXTERNALS_FULLPATH_BOOST}/include
${IRODS_EXTERNALS_FULLPATH_FMT}/include
)
target_link_libraries(
${IRODS_CURRENT_PLUGIN_TARGET}
PRIVATE
${IRODS_PLUGIN_LINK_LIBRARIES_${TYPE}}
irods_common
irods_plugin_dependencies
${OPENSSL_CRYPTO_LIBRARY}
${GSS_LIBRARIES}
${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_system.so
${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so
)
set_property(
TARGET ${IRODS_CURRENT_PLUGIN_TARGET}
APPEND
PROPERTY COMPILE_DEFINITIONS
${IRODS_PLUGIN_COMPILE_DEFINITIONS_${TYPE}} ${IRODS_COMPILE_DEFINITIONS} BOOST_SYSTEM_NO_DEPRECATED
)
install(
TARGETS
${IRODS_CURRENT_PLUGIN_TARGET}
LIBRARY
DESTINATION ${IRODS_PLUGINS_DIRECTORY}/auth
)
foreach(PLUGIN ${IRODS_AUTH_PLUGINS})
foreach(TYPE ${IRODS_PLUGIN_TYPES})
set(IRODS_CURRENT_PLUGIN_TARGET ${PLUGIN}_${TYPE})
add_library(
${IRODS_CURRENT_PLUGIN_TARGET}
MODULE
${IRODS_AUTH_PLUGIN_${PLUGIN}_SOURCES}
)
target_include_directories(
${IRODS_CURRENT_PLUGIN_TARGET}
PRIVATE
${IRODS_INCLUDE_DIRS}
${IRODS_EXTERNALS_FULLPATH_BOOST}/include
${IRODS_EXTERNALS_FULLPATH_FMT}/include
)
target_link_libraries(
${IRODS_CURRENT_PLUGIN_TARGET}
PRIVATE
${IRODS_PLUGIN_LINK_LIBRARIES_${TYPE}}
irods_common
irods_plugin_dependencies
nlohmann_json::nlohmann_json
${OPENSSL_CRYPTO_LIBRARY}
${GSS_LIBRARIES}
${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_filesystem.so
${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_system.so
${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so
dl)
set_property(
TARGET ${IRODS_CURRENT_PLUGIN_TARGET}
APPEND
PROPERTY COMPILE_DEFINITIONS
${IRODS_PLUGIN_COMPILE_DEFINITIONS_${TYPE}} ${IRODS_COMPILE_DEFINITIONS} BOOST_SYSTEM_NO_DEPRECATED
)
install(
TARGETS
${IRODS_CURRENT_PLUGIN_TARGET}
LIBRARY
DESTINATION ${IRODS_PLUGINS_DIRECTORY}/auth
)
endforeach()
endforeach()

install(
Expand Down