diff --git a/ports/iceoryx/acl.patch b/ports/iceoryx/acl.patch index 49046fb157..78385332b6 100644 --- a/ports/iceoryx/acl.patch +++ b/ports/iceoryx/acl.patch @@ -1,24 +1,30 @@ -diff --git a/iceoryx_hoofs/platform/CMakeLists.txt b/iceoryx_hoofs/platform/CMakeLists.txt -index 78bad09f8..293784c06 100644 ---- a/iceoryx_hoofs/platform/CMakeLists.txt -+++ b/iceoryx_hoofs/platform/CMakeLists.txt -@@ -55,6 +55,19 @@ target_link_libraries(iceoryx_platform PRIVATE ${ICEORYX_SANITIZER_FLAGS}) - target_compile_options(iceoryx_platform PRIVATE ${ICEORYX_WARNINGS} ${ICEORYX_SANITIZER_FLAGS}) +diff --git a/iceoryx_hoofs/CMakeLists.txt b/iceoryx_hoofs/CMakeLists.txt +index a8238ff..9741fd3 100644 +--- a/iceoryx_hoofs/CMakeLists.txt ++++ b/iceoryx_hoofs/CMakeLists.txt +@@ -217,7 +217,9 @@ target_link_libraries(iceoryx_hoofs + ) if(LINUX) +- target_link_libraries(iceoryx_hoofs PRIVATE acl atomic ${CODE_COVERAGE_LIBS}) + find_package(PkgConfig REQUIRED) -+ pkg_check_modules(ACL REQUIRED libacl) -+ -+ target_include_directories(iceoryx_platform -+ PUBLIC -+ ${ACL_INCLUDE_DIRS} -+ ) -+ -+ target_link_directories(iceoryx_platform -+ PUBLIC -+ ${ACL_LIBRARY_DIRS} -+ ) -+ - target_link_libraries(iceoryx_platform - PUBLIC - rt ++ pkg_check_modules(ACL REQUIRED IMPORTED_TARGET libacl) ++ target_link_libraries(iceoryx_hoofs PUBLIC PkgConfig::ACL PRIVATE atomic ${CODE_COVERAGE_LIBS}) + endif() + + target_compile_options(iceoryx_hoofs PRIVATE ${ICEORYX_WARNINGS} ${ICEORYX_SANITIZER_FLAGS}) +diff --git a/iceoryx_hoofs/cmake/Config.cmake.in b/iceoryx_hoofs/cmake/Config.cmake.in +index c03b3b5..731c636 100644 +--- a/iceoryx_hoofs/cmake/Config.cmake.in ++++ b/iceoryx_hoofs/cmake/Config.cmake.in +@@ -17,6 +17,10 @@ + @PACKAGE_INIT@ + + include(CMakeFindDependencyMacro) ++if(LINUX) ++ find_dependency(PkgConfig) ++ pkg_check_modules(ACL REQUIRED libacl IMPORTED_TARGET) ++endif() + + include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") + list(APPEND CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/@DESTINATION_CONFIGDIR@") diff --git a/ports/iceoryx/portfile.cmake b/ports/iceoryx/portfile.cmake index baae4b9f23..ac7864c174 100644 --- a/ports/iceoryx/portfile.cmake +++ b/ports/iceoryx/portfile.cmake @@ -30,8 +30,11 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME iceoryx_binding_c CONFIG_PATH lib/cmake/ic vcpkg_cmake_config_fixup(PACKAGE_NAME iceoryx_hoofs CONFIG_PATH lib/cmake/iceoryx_hoofs DO_NOT_DELETE_PARENT_CONFIG_PATH) vcpkg_cmake_config_fixup(PACKAGE_NAME iceoryx_posh CONFIG_PATH lib/cmake/iceoryx_posh) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/doc" +) if(TOML_CONFIG) vcpkg_copy_tools(TOOL_NAMES iox-roudi AUTO_CLEAN) diff --git a/ports/iceoryx/vcpkg.json b/ports/iceoryx/vcpkg.json index 28ce1f98b8..6180ba69ca 100644 --- a/ports/iceoryx/vcpkg.json +++ b/ports/iceoryx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "iceoryx", "version": "2.0.2", + "port-version": 1, "description": "True zero-copy inter-process-communication", "homepage": "https://iceoryx.io", "license": "Apache-2.0", @@ -25,7 +26,7 @@ ], "features": { "many-to-many": { - "description": "Using the n:n pattern for communication" + "description": "Using the m:n pattern for communication" }, "toml-config": { "description": "TOML support for RouDi with dynamic configuration", diff --git a/versions/baseline.json b/versions/baseline.json index 0b52064a6b..5bcd6ddf6f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3038,7 +3038,7 @@ }, "iceoryx": { "baseline": "2.0.2", - "port-version": 0 + "port-version": 1 }, "icu": { "baseline": "72.1", diff --git a/versions/i-/iceoryx.json b/versions/i-/iceoryx.json index 2689727d74..bb4508ce90 100644 --- a/versions/i-/iceoryx.json +++ b/versions/i-/iceoryx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01c97cf0c2e2ba63c406b8b0d2b51443dec98ee2", + "version": "2.0.2", + "port-version": 1 + }, { "git-tree": "77c813fcc56fee86559404c7c22c2396509cff1a", "version": "2.0.2",