iox-eclipse-iceoryx#2330 Edit CMakeLists.txt

khromenokroman · Sep 9, 2024 · 9775883 · 9775883
1 parent c9236aa
commit 9775883
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/iceoryx_platform/cmake/IceoryxPackageHelper.cmake b/iceoryx_platform/cmake/IceoryxPackageHelper.cmake
@@ -348,7 +348,8 @@ Macro(iox_add_library)
         if(USE_SYSTEMD AND ("${IOX_TARGET}" STREQUAL "iceoryx_posh_roudi"))
             message(STATUS "[i] Configuring ${IOX_TARGET} with systemd support.")
             target_compile_definitions(${IOX_TARGET} PRIVATE USE_SYSTEMD=1)
-            target_link_libraries(${IOX_TARGET} PUBLIC ${IOX_PUBLIC_LIBS_LINUX} PRIVATE ${IOX_PRIVATE_LIBS_LINUX} systemd)
+            target_link_libraries(${IOX_TARGET} PUBLIC ${IOX_PUBLIC_LIBS_LINUX} PRIVATE ${IOX_PRIVATE_LIBS_LINUX})
+#            target_link_libraries(${IOX_TARGET} PUBLIC ${IOX_PUBLIC_LIBS_LINUX} PRIVATE ${IOX_PRIVATE_LIBS_LINUX} systemd)
         else()
             target_link_libraries(${IOX_TARGET} PUBLIC ${IOX_PUBLIC_LIBS_LINUX} PRIVATE ${IOX_PRIVATE_LIBS_LINUX})
         endif()

diff --git a/iceoryx_posh/BUILD.bazel b/iceoryx_posh/BUILD.bazel
@@ -31,6 +31,7 @@ configure_file(
             "IOX_COMMUNICATION_POLICY": "ManyToManyPolicy",
             "IOX_DEFAULT_RESOURCE_PREFIX": "iox1",
             "IOX_EXPERIMENTAL_POSH_FLAG": "false",
+            "USE_SYSTEMD_FLAG": "false",
             "IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY": "8",
             "IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY": "256",
             "IOX_MAX_CLIENTS_PER_SERVER": "256",
@@ -58,6 +59,7 @@ configure_file(
             "IOX_COMMUNICATION_POLICY": "ManyToManyPolicy",
             "IOX_DEFAULT_RESOURCE_PREFIX": "iox1",
             "IOX_EXPERIMENTAL_POSH_FLAG": "false",
+            "USE_SYSTEMD_FLAG": "false",
             "IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY": "8",
             "IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY": "256",
             "IOX_MAX_CLIENTS_PER_SERVER": "256",

diff --git a/iceoryx_posh/CMakeLists.txt b/iceoryx_posh/CMakeLists.txt
@@ -198,6 +198,7 @@ iox_add_library(
                         source/capro
                         source/roudi
     PRIVATE_LIBS_QNX    socket
+    PRIVATE_LIBS_LINUX  systemd
     BUILD_INTERFACE     ${CMAKE_CURRENT_SOURCE_DIR}/include
     INSTALL_INTERFACE   include/${PREFIX}
     FILES

diff --git a/iceoryx_posh/cmake/IceoryxPoshDeployment.cmake b/iceoryx_posh/cmake/IceoryxPoshDeployment.cmake
@@ -144,5 +144,12 @@ else()
 endif()
 message(STATUS "[i] IOX_EXPERIMENTAL_POSH_FLAG: ${IOX_EXPERIMENTAL_POSH_FLAG}")
 
+if(USE_SYSTEMD)
+    set(USE_SYSTEMD_FLAG true)
+else()
+    set(USE_SYSTEMD_FLAG false)
+endif()
+message(STATUS "[i] USE_SYSTEMD_FLAG: ${USE_SYSTEMD_FLAG}")
+
 message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_posh configuration: >>>>>>>>>>>>>>")
 
diff --git a/iceoryx_posh/cmake/iceoryx_posh_deployment.hpp.in b/iceoryx_posh/cmake/iceoryx_posh_deployment.hpp.in
@@ -68,6 +68,7 @@ constexpr uint32_t IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY =
  constexpr uint32_t IOX_MAX_REQUESTS_PROCESSED_SIMULTANEOUSLY = static_cast<uint32_t>(@IOX_MAX_REQUESTS_PROCESSED_SIMULTANEOUSLY@);
  constexpr const char IOX_DEFAULT_RESOURCE_PREFIX[] = "@IOX_DEFAULT_RESOURCE_PREFIX@";
  constexpr bool IOX_EXPERIMENTAL_POSH_FLAG = @IOX_EXPERIMENTAL_POSH_FLAG@;
+ constexpr bool USE_SYSTEMD_FLAG = @USE_SYSTEMD_FLAG@;
 // clang-format on
 } // namespace build
 } // namespace iox