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

Adjust build rules to not depend on scitokenscpp to build libXrdSecztn #1936

Merged
merged 1 commit into from
Mar 3, 2023
Merged

Adjust build rules to not depend on scitokenscpp to build libXrdSecztn #1936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmake/XRootDDefaults.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ option( ENABLE_XRDEC "Enable erasure coding component."
option( ENABLE_ASAN "Enable adress sanitizer." FALSE )
option( ENABLE_TSAN "Enable thread sanitizer." FALSE )
option( ENABLE_XRDCLHTTP "Enable xrdcl-http plugin." TRUE )
option( ENABLE_SCITOKENS "Enable SciTokens plugin." TRUE )
cmake_dependent_option( ENABLE_SCITOKENS "Enable SciTokens plugin." TRUE "NOT XRDCL_ONLY" FALSE )
cmake_dependent_option( ENABLE_MACAROONS "Enable Macaroons plugin." TRUE "NOT XRDCL_ONLY" FALSE )
option( FORCE_ENABLED "Fail build if enabled components cannot be built." FALSE )
cmake_dependent_option( USE_SYSTEM_ISAL "Use isa-l installed in the system" FALSE "ENABLE_XRDEC" FALSE )
Expand Down
2 changes: 0 additions & 2 deletions packaging/rhel/xrootd.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,9 +883,7 @@ fi
%{_libdir}/libXrdSecpwd-5.so
%{_libdir}/libXrdSecsss-5.so
%{_libdir}/libXrdSecunix-5.so
%if %{?_with_scitokens:1}%{!?_with_scitokens:0}
%{_libdir}/libXrdSecztn-5.so
%endif
%{_libdir}/libXrdUtils.so.3*
%{_libdir}/libXrdXml.so.3*

Expand Down
11 changes: 1 addition & 10 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ include( XrdSec )
include( XrdXml )
include( XrdHeaders )
include( XrdSecgsi )
include( XrdSecztn )

if( BUILD_KRB5 )
include( XrdSeckrb5 )
Expand All @@ -46,23 +47,13 @@ if( BUILD_XRDEC )
add_subdirectory( XrdEc )
endif()

if( BUILD_SCITOKENS )
find_package( SciTokensCpp REQUIRED )
include_directories(
${SCITOKENS_CPP_INCLUDE_DIR}
XrdSciTokens/vendor/picojson
XrdSciTokens/vendor/inih )
include( XrdSecztn )
endif()

if( NOT XRDCL_ONLY )
include( XrdServer )
include( XrdDaemons )
include( XrdFrm )
include( XrdFfs )
include( XrdPlugins )
include( XrdSsi )

include( XrdPfc )

if( CMAKE_COMPILER_IS_GNUCXX )
Expand Down
7 changes: 7 additions & 0 deletions src/XrdSciTokens.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
include( XRootDCommon )

find_package( SciTokensCpp REQUIRED )

#-------------------------------------------------------------------------------
# Modules
#-------------------------------------------------------------------------------
set( LIB_XRD_SCITOKENS XrdAccSciTokens-${PLUGIN_VERSION} )

include_directories(
${SCITOKENS_CPP_INCLUDE_DIR}
XrdSciTokens/vendor/picojson
XrdSciTokens/vendor/inih )

#-------------------------------------------------------------------------------
# The XrdPfc library
#-------------------------------------------------------------------------------
Expand Down