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#6251,irods/irods#6256] find_package for fmt and spdlog (4-3-stable) #2169

Merged
merged 2 commits into from
Feb 21, 2024
Merged

[irods/irods#6251,irods/irods#6256] find_package for fmt and spdlog (4-3-stable) #2169

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3af4977
[irods/irods#6251] use find_package for fmt
SwooshyCueb Feb 20, 2024
8b97569
[irods/irods#6256] do not explicitly add spdlog to includes
SwooshyCueb Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ if (NOT DEFINED THREADS_PREFER_PTHREAD_FLAG)
endif()
find_package(Threads REQUIRED)
find_package(nlohmann_json "3.6.1" REQUIRED)
find_package(fmt "8.1.1"
HINTS "${IRODS_EXTERNALS_FULLPATH_FMT}")
find_package(CURL REQUIRED)
find_package(OpenSSL REQUIRED)
find_package(LibXml2 REQUIRED)
Expand Down Expand Up @@ -116,9 +118,9 @@ target_link_libraries(
${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_system.so
${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_thread.so
${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_filesystem.so
${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so
Threads::Threads
nlohmann_json::nlohmann_json
fmt::fmt
rt
)
target_include_directories(
Expand All @@ -127,9 +129,7 @@ target_include_directories(
${IRODS_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/s3/s3_transport/include
${IRODS_EXTERNALS_FULLPATH_BOOST}/include
${IRODS_EXTERNALS_FULLPATH_FMT}/include
${IRODS_EXTERNALS_FULLPATH_S3}/include
${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include
)
target_compile_definitions(
irods_s3_plugin
Expand Down
Loading