[irods/irods_6256] use find_package for spdlog

irods · Feb 21, 2024 · 9edae97 · 9edae97
1 parent 69dc154
commit 9edae97
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -92,6 +92,8 @@ find_package(CURL REQUIRED)
 find_package(nlohmann_json "3.6.1" REQUIRED)
 find_package(fmt "8.1.1"
   HINTS "${IRODS_EXTERNALS_FULLPATH_FMT}")
+find_package(spdlog "1.9.2"
+  HINTS "${IRODS_EXTERNALS_FULLPATH_SPDLOG}")
 find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL)
 
 # jwt library to handle OIDC JWT responses containing user information

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -23,6 +23,7 @@ target_link_libraries(
   irods_http_api_core
   PUBLIC
   fmt::fmt
+  spdlog::spdlog_header_only
   PRIVATE
   irods_client
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_filesystem.so"
@@ -51,7 +52,6 @@ target_include_directories(
   "${CMAKE_CURRENT_BINARY_DIR}/include"
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 set_target_properties(irods_http_api_core PROPERTIES EXCLUDE_FROM_ALL TRUE)
diff --git a/endpoints/authentication/CMakeLists.txt b/endpoints/authentication/CMakeLists.txt
@@ -29,7 +29,6 @@ target_include_directories(
   "${IRODS_HTTP_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 set_target_properties(irods_http_api_endpoint_authentication PROPERTIES EXCLUDE_FROM_ALL TRUE)
diff --git a/endpoints/collections/CMakeLists.txt b/endpoints/collections/CMakeLists.txt
@@ -26,7 +26,6 @@ target_include_directories(
   "${IRODS_HTTP_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 set_target_properties(irods_http_api_endpoint_collections PROPERTIES EXCLUDE_FROM_ALL TRUE)
diff --git a/endpoints/data_objects/CMakeLists.txt b/endpoints/data_objects/CMakeLists.txt
@@ -26,7 +26,6 @@ target_include_directories(
   "${IRODS_HTTP_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 set_target_properties(irods_http_api_endpoint_data_objects PROPERTIES EXCLUDE_FROM_ALL TRUE)
diff --git a/endpoints/information/CMakeLists.txt b/endpoints/information/CMakeLists.txt
@@ -26,7 +26,6 @@ target_include_directories(
   "${IRODS_HTTP_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 if (IRODS_ENABLE_GENQUERY2)

diff --git a/endpoints/query/CMakeLists.txt b/endpoints/query/CMakeLists.txt
@@ -26,7 +26,6 @@ target_include_directories(
   "${IRODS_HTTP_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 if (IRODS_ENABLE_GENQUERY2)

diff --git a/endpoints/resources/CMakeLists.txt b/endpoints/resources/CMakeLists.txt
@@ -26,7 +26,6 @@ target_include_directories(
   "${IRODS_HTTP_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 set_target_properties(irods_http_api_endpoint_resources PROPERTIES EXCLUDE_FROM_ALL TRUE)
diff --git a/endpoints/rules/CMakeLists.txt b/endpoints/rules/CMakeLists.txt
@@ -26,7 +26,6 @@ target_include_directories(
   "${IRODS_HTTP_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 set_target_properties(irods_http_api_endpoint_rules PROPERTIES EXCLUDE_FROM_ALL TRUE)
diff --git a/endpoints/shared/CMakeLists.txt b/endpoints/shared/CMakeLists.txt
@@ -26,7 +26,6 @@ target_include_directories(
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/core/include"
   "${IRODS_HTTP_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 set_target_properties(irods_http_api_shared_operations PROPERTIES EXCLUDE_FROM_ALL TRUE)
diff --git a/endpoints/tickets/CMakeLists.txt b/endpoints/tickets/CMakeLists.txt
@@ -26,7 +26,6 @@ target_include_directories(
   "${IRODS_HTTP_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 set_target_properties(irods_http_api_endpoint_tickets PROPERTIES EXCLUDE_FROM_ALL TRUE)
diff --git a/endpoints/users_groups/CMakeLists.txt b/endpoints/users_groups/CMakeLists.txt
@@ -28,7 +28,6 @@ target_include_directories(
   "${IRODS_HTTP_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 set_target_properties(irods_http_api_endpoint_users_groups PROPERTIES EXCLUDE_FROM_ALL TRUE)
diff --git a/endpoints/zones/CMakeLists.txt b/endpoints/zones/CMakeLists.txt
@@ -26,7 +26,6 @@ target_include_directories(
   "${IRODS_HTTP_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_HTTP_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
 set_target_properties(irods_http_api_endpoint_zones PROPERTIES EXCLUDE_FROM_ALL TRUE)