diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f3b87c..b039689 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.7.0 FATAL_ERROR) -set(IRODS_MINIMUM_VERSION "4.3.1") +set(IRODS_MINIMUM_VERSION "4.3.2") find_package(IRODS "${IRODS_MINIMUM_VERSION}" REQUIRED) set(IRODS_PLUGIN_REVISION "0") set(IRODS_PLUGIN_VERSION "${IRODS_MINIMUM_VERSION}.${IRODS_PLUGIN_REVISION}") @@ -24,10 +24,8 @@ include(${IRODS_TARGETS_PATH}) include(GNUInstallDirs) include(UseLibCXX) -if (IRODS_VERSION VERSION_GREATER "4.3.1") - find_package(fmt "8.1.1" - HINTS "${IRODS_EXTERNALS_FULLPATH_FMT}") -endif() +find_package(fmt "8.1.1" + HINTS "${IRODS_EXTERNALS_FULLPATH_FMT}") find_package(Threads REQUIRED) find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL) @@ -66,19 +64,11 @@ target_include_directories(${PLUGIN} PRIVATE ${IRODS_INCLUDE_DIRS} target_link_libraries(${PLUGIN} PRIVATE irods_server irods_common nlohmann_json::nlohmann_json + fmt::fmt ${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_filesystem.so ${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_system.so ${CMAKE_DL_LIBS}) -if (IRODS_VERSION VERSION_GREATER "4.3.1") - target_link_libraries(${PLUGIN} PRIVATE fmt::fmt) -else() - target_include_directories(${PLUGIN} PRIVATE ${IRODS_EXTERNALS_FULLPATH_SPDLOG}/include - ${IRODS_EXTERNALS_FULLPATH_FMT}/include) - - target_link_libraries(${PLUGIN} PRIVATE ${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so) -endif() - install(TARGETS ${PLUGIN} LIBRARY DESTINATION ${IRODS_PLUGINS_DIRECTORY}/rule_engines) install(FILES ${CMAKE_SOURCE_DIR}/packaging/test_rule_engine_plugin_metadata_guard.py