[irods/irods#6251] use find_package for fmt

CMakeLists.txt

@@ -90,6 +90,11 @@ find_package(CURL REQUIRED)
 find_package(nlohmann_json "3.6.1" REQUIRED)
 find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL)
 
+if (IRODS_VERSION VERSION_GREATER "4.3.1")
+  find_package(fmt "8.1.1"
+    HINTS "${IRODS_EXTERNALS_FULLPATH_FMT}")
+endif()
+
 include(ObjectTargetHelpers)
 
 add_subdirectory(core)

core/CMakeLists.txt

@@ -32,7 +32,6 @@ target_link_libraries(
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_filesystem.so"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_program_options.so"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_url.so"
-  "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so"
   CURL::libcurl
   hmac_sha256
 )
@@ -57,8 +56,27 @@ target_include_directories(
   "${CMAKE_CURRENT_BINARY_DIR}/include"
   "${IRODS_S3_API_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
   "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
+if (IRODS_VERSION VERSION_GREATER "4.3.1")
+  target_link_libraries(
+    irods_s3_api_core
+    PUBLIC
+    fmt::fmt
+  )
+else()
+  target_link_libraries(
+    irods_s3_api_core
+    PRIVATE
+    "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so"
+  )
+
+  target_include_directories(
+    irods_s3_api_core
+    PRIVATE
+    "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
+  )
+endif()
+
 set_target_properties(irods_s3_api_core PROPERTIES EXCLUDE_FROM_ALL TRUE)

endpoints/authentication/CMakeLists.txt

@@ -26,8 +26,27 @@ target_include_directories(
   "${IRODS_S3_API_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_S3_API_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
   "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
+if (IRODS_VERSION VERSION_GREATER "4.3.1")
+  target_link_libraries(
+    irods_s3_api_endpoint_authentication
+    PUBLIC
+    fmt::fmt
+  )
+else()
+  target_link_libraries(
+    irods_s3_api_endpoint_authentication
+    PRIVATE
+    "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so"
+  )
+
+  target_include_directories(
+    irods_s3_api_endpoint_authentication
+    PRIVATE
+    "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
+  )
+endif()
+
 set_target_properties(irods_s3_api_endpoint_authentication PROPERTIES EXCLUDE_FROM_ALL TRUE)

endpoints/put_object/CMakeLists.txt

@@ -26,8 +26,27 @@ target_include_directories(
   "${IRODS_S3_API_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_S3_API_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
   "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
+if (IRODS_VERSION VERSION_GREATER "4.3.1")
+  target_link_libraries(
+    irods_s3_api_endpoint_put_object
+    PUBLIC
+    fmt::fmt
+  )
+else()
+  target_link_libraries(
+    irods_s3_api_endpoint_put_object
+    PRIVATE
+    "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so"
+  )
+
+  target_include_directories(
+    irods_s3_api_endpoint_put_object
+    PRIVATE
+    "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
+  )
+endif()
+
 set_target_properties(irods_s3_api_endpoint_put_object PROPERTIES EXCLUDE_FROM_ALL TRUE)

endpoints/s3/CMakeLists.txt

@@ -35,8 +35,27 @@ target_include_directories(
   "${IRODS_S3_API_PROJECT_BINARY_DIR}/core/include"
   "${IRODS_S3_API_PROJECT_SOURCE_DIR}/endpoints/shared/include"
   "${IRODS_EXTERNALS_FULLPATH_BOOST}/include"
-  "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
   "${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include"
 )
 
+if (IRODS_VERSION VERSION_GREATER "4.3.1")
+  target_link_libraries(
+    irods_s3_endpoints
+    PUBLIC
+    fmt::fmt
+  )
+else()
+  target_link_libraries(
+    irods_s3_endpoints
+    PRIVATE
+    "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so"
+  )
+
+  target_include_directories(
+    irods_s3_endpoints
+    PRIVATE
+    "${IRODS_EXTERNALS_FULLPATH_FMT}/include"
+  )
+endif()
+
 set_target_properties(irods_s3_endpoints PROPERTIES EXCLUDE_FROM_ALL TRUE)