-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[irods/irods_7265] Minor reorganization + CMake TLC
- Project tree structure reorganized to resemble that of main irods repo. - Added quotes around paths in CMake files. - Removed CMAKE_SHARED_LINKER_FLAGS_INIT and CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT, as no shared libraries are built. - Removed unused postinst script for nonexistent data_world package - Removed rpm package dependency declaration on openssl - Fixed postinst CPack variables
- Loading branch information
1 parent
88bbf7b
commit e174396
Showing
23 changed files
with
229 additions
and
230 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| add_library( | ||
| irods_cap_indexing_common_obj | ||
| OBJECT | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/src/plugin_specific_configuration.cpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/src/configuration.cpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/src/utilities.cpp" | ||
| ) | ||
| target_link_libraries( | ||
| irods_cap_indexing_common_obj | ||
| PUBLIC | ||
| irods_common | ||
| irods_server | ||
| nlohmann_json::nlohmann_json | ||
| PRIVATE | ||
| "${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_system.so" | ||
| "${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_filesystem.so" | ||
| "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so" | ||
| ) | ||
| target_include_directories( | ||
| irods_cap_indexing_common_obj | ||
| PUBLIC | ||
| "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" | ||
| PRIVATE | ||
| "${IRODS_EXTERNALS_FULLPATH_BOOST}/include" | ||
| "${IRODS_EXTERNALS_FULLPATH_FMT}/include" | ||
| ) | ||
| target_compile_definitions( | ||
| irods_cap_indexing_common_obj | ||
| PUBLIC | ||
| BOOST_SYSTEM_NO_DEPRECATED | ||
| RODS_SERVER | ||
| ENABLE_RE | ||
| PRIVATE | ||
| ${IRODS_COMPILE_DEFINITIONS} | ||
| ${IRODS_COMPILE_DEFINITIONS_PRIVATE} | ||
| ) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
plugin_specific_configuration.cpp → common/src/plugin_specific_configuration.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #include "utilities.hpp" | ||
| #include "irods/private/indexing/utilities.hpp" | ||
|
|
||
| #include <irods/rcMisc.h> | ||
|
|
||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| set(IRODS_POLICY_NAME "elasticsearch") | ||
| set(IRODS_PLUGIN_TARGET_NAME "${IRODS_TARGET_NAME_PREFIX}-${IRODS_POLICY_NAME}") | ||
|
|
||
| string(REPLACE "_" "-" IRODS_POLICY_NAME_HYPHENS "${IRODS_POLICY_NAME}") | ||
| set(IRODS_POLICY_PACKAGE_COMPONENT "${IRODS_POLICY_NAME_HYPHENS}") | ||
|
|
||
| include(ObjectTargetHelpers) | ||
|
|
||
| add_library( | ||
| "${IRODS_PLUGIN_TARGET_NAME}" | ||
| MODULE | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp" | ||
| ) | ||
| target_link_objects( | ||
| "${IRODS_PLUGIN_TARGET_NAME}" | ||
| PRIVATE | ||
| irods_cap_indexing_common_obj | ||
| ) | ||
| target_link_libraries( | ||
| "${IRODS_PLUGIN_TARGET_NAME}" | ||
| PRIVATE | ||
| irods_common | ||
| irods_server | ||
| nlohmann_json::nlohmann_json | ||
| "${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_system.so" | ||
| "${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_url.so" | ||
| "${IRODS_EXTERNALS_FULLPATH_FMT}/lib/libfmt.so" | ||
| ) | ||
| target_include_directories( | ||
| "${IRODS_PLUGIN_TARGET_NAME}" | ||
| PRIVATE | ||
| "${IRODS_EXTERNALS_FULLPATH_BOOST}/include" | ||
| "${IRODS_EXTERNALS_FULLPATH_FMT}/include" | ||
| ) | ||
| target_compile_definitions( | ||
| "${IRODS_PLUGIN_TARGET_NAME}" | ||
| PRIVATE | ||
| BOOST_SYSTEM_NO_DEPRECATED | ||
| RODS_SERVER | ||
| ENABLE_RE | ||
| ${IRODS_COMPILE_DEFINITIONS} | ||
| ${IRODS_COMPILE_DEFINITIONS_PRIVATE} | ||
| IRODS_PLUGIN_VERSION="${IRODS_PLUGIN_VERSION}" | ||
| ) | ||
| target_compile_options( | ||
| "${IRODS_PLUGIN_TARGET_NAME}" | ||
| PRIVATE | ||
| -Wno-write-strings | ||
| ) | ||
|
|
||
| install( | ||
| TARGETS | ||
| "${IRODS_PLUGIN_TARGET_NAME}" | ||
| LIBRARY | ||
| DESTINATION "${IRODS_PLUGINS_DIRECTORY}/rule_engines" | ||
| COMPONENT "${IRODS_POLICY_PACKAGE_COMPONENT}" | ||
| ) | ||
|
|
||
| string(TOUPPER "${IRODS_POLICY_PACKAGE_COMPONENT}" IRODS_POLICY_PACKAGE_COMPONENT_UPPERCASE) | ||
| string(REPLACE "_" "-" IRODS_PLUGIN_TARGET_NAME_HYPHENS "${IRODS_PLUGIN_TARGET_NAME}") | ||
|
|
||
| # CPack variables need to be set with PARENT_SCOPE, so they will be in scope for CPack. | ||
|
|
||
| set(CPACK_DEBIAN_${IRODS_POLICY_PACKAGE_COMPONENT_UPPERCASE}_PACKAGE_NAME "${IRODS_PLUGIN_TARGET_NAME_HYPHENS}" PARENT_SCOPE) | ||
| set(CPACK_DEBIAN_${IRODS_POLICY_PACKAGE_COMPONENT_UPPERCASE}_PACKAGE_DEPENDS "irods-server (= ${IRODS_VERSION}), irods-runtime (= ${IRODS_VERSION}), libc6" PARENT_SCOPE) | ||
| set(CPACK_DEBIAN_${IRODS_POLICY_PACKAGE_COMPONENT_UPPERCASE}_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/packaging/postinst;" PARENT_SCOPE) | ||
|
|
||
| set(CPACK_RPM_${IRODS_POLICY_PACKAGE_COMPONENT_UPPERCASE}_PACKAGE_NAME "${IRODS_PLUGIN_TARGET_NAME_HYPHENS}" PARENT_SCOPE) | ||
| set(CPACK_RPM_${IRODS_POLICY_PACKAGE_COMPONENT_UPPERCASE}_PACKAGE_REQUIRES "irods-server = ${IRODS_VERSION}, irods-runtime = ${IRODS_VERSION}" PARENT_SCOPE) | ||
| set(CPACK_RPM_${IRODS_POLICY_PACKAGE_COMPONENT_UPPERCASE}_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/packaging/postinst" PARENT_SCOPE) |
File renamed without changes.
6 changes: 3 additions & 3 deletions
6
...rods_rule_engine_plugin-elasticsearch.cpp → elasticsearch/src/main.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.