[SciTokens] Make SciTokens adhere to repo standards.

xrootd · Jan 11, 2021 · 786c36e · 786c36e
1 parent 4d7d6de
commit 786c36e
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 18 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -23,6 +23,7 @@ include( XrdCrypto )
 include( XrdSec )
 include( XrdXml )
 include( XrdHeaders )
+#include( XrdSecztn )
 
 if( BUILD_CRYPTO )
   include( XrdSecgsi )
@@ -52,7 +53,6 @@ if( NOT XRDCL_ONLY )
   include( XrdFfs )
   include( XrdPlugins )
   include( XrdSsi )
-#  include( XrdCns ) TODO: this is using the old client, needs refactoring or needs to be removed!
 
   include( XrdPfc )
 
@@ -74,7 +74,7 @@ if( NOT XRDCL_ONLY )
   endif()
 
   if( BUILD_SCITOKENS )
-    add_subdirectory( XrdSciTokens )
+    include( XrdSciTokens )
   endif()
 
 endif()

diff --git a/src/XrdSciTokens.cmake b/src/XrdSciTokens.cmake
@@ -0,0 +1,44 @@
+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
+#-------------------------------------------------------------------------------
+add_library(
+   ${LIB_XRD_SCITOKENS}
+   MODULE
+   XrdSciTokens/XrdSciTokensAccess.cc
+                                       XrdSciTokens/XrdSciTokensHelper.hh )
+target_link_libraries(
+   ${LIB_XRD_SCITOKENS}
+   ${SCITOKENS_CPP_LIBRARIES}
+   XrdUtils
+   XrdServer
+   dl
+   pthread )
+
+set_target_properties(
+   ${LIB_XRD_SCITOKENS}
+   PROPERTIES
+   INTERFACE_LINK_LIBRARIES ""
+   LINK_INTERFACE_LIBRARIES "" )
+
+#-------------------------------------------------------------------------------
+# Install
+#-------------------------------------------------------------------------------
+install(
+   TARGETS
+   ${LIB_XRD_SCITOKENS}
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
diff --git a/src/XrdSciTokens/CMakeLists.txt b/src/XrdSciTokens/CMakeLists.txt
diff --git a/src/XrdSciTokens/src/XrdAccSciTokens.cc → src/XrdSciTokens/XrdSciTokensAccess.cc b/src/XrdSciTokens/src/XrdAccSciTokens.cc → src/XrdSciTokens/XrdSciTokensAccess.cc
@@ -19,7 +19,7 @@
 #include "picojson.h"
 
 #include "scitokens/scitokens.h"
-#include "XrdSciTokensHelper.hh"
+#include "XrdSciTokens/XrdSciTokensHelper.hh"
 
 // The status-quo to retrieve the default object is to copy/paste the
 // linker definition and invoke directly.

diff --git a/src/XrdSciTokens/src/XrdSciTokensHelper.hh → src/XrdSciTokens/XrdSciTokensHelper.hh b/src/XrdSciTokens/src/XrdSciTokensHelper.hh → src/XrdSciTokens/XrdSciTokensHelper.hh