From e57384fa497f6d70bf6e0b7ac9b4bb7f120ff250 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Tue, 31 Oct 2023 15:52:10 +0100 Subject: [PATCH 1/2] Refs #19839: Fix flow controllers utests compilation when using Fast CDR from thirdparty Signed-off-by: EduPonz --- test/unittest/rtps/flowcontrol/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unittest/rtps/flowcontrol/CMakeLists.txt b/test/unittest/rtps/flowcontrol/CMakeLists.txt index 9eebf40d8ad..af77847804d 100644 --- a/test/unittest/rtps/flowcontrol/CMakeLists.txt +++ b/test/unittest/rtps/flowcontrol/CMakeLists.txt @@ -45,7 +45,7 @@ target_include_directories(FlowControllerFactoryTests PRIVATE ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ) -target_link_libraries(FlowControllerFactoryTests GTest::gmock) +target_link_libraries(FlowControllerFactoryTests GTest::gmock fastcdr) if(MSVC OR MSVC_IDE) target_link_libraries(FlowControllerFactoryTests ${PRIVACY} iphlpapi Shlwapi @@ -73,7 +73,7 @@ target_include_directories(FlowControllerPublishModesTests PRIVATE ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ) -target_link_libraries(FlowControllerPublishModesTests GTest::gmock) +target_link_libraries(FlowControllerPublishModesTests GTest::gmock fastcdr) if(MSVC OR MSVC_IDE) target_link_libraries(FlowControllerPublishModesTests ${PRIVACY} iphlpapi Shlwapi @@ -97,7 +97,7 @@ target_include_directories(FlowControllerSchedulersTests PRIVATE ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ) -target_link_libraries(FlowControllerSchedulersTests GTest::gmock) +target_link_libraries(FlowControllerSchedulersTests GTest::gmock fastcdr) if(MSVC OR MSVC_IDE) target_link_libraries(FlowControllerSchedulersTests ${PRIVACY} iphlpapi Shlwapi From 01ddc8e46d554ac871d779b8a093254fd040e622 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Thu, 2 Nov 2023 07:48:16 +0100 Subject: [PATCH 2/2] Refs #19839: Apply Ricardo's suggestions Signed-off-by: EduPonz --- test/unittest/rtps/flowcontrol/CMakeLists.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/unittest/rtps/flowcontrol/CMakeLists.txt b/test/unittest/rtps/flowcontrol/CMakeLists.txt index af77847804d..ba5b2d5cffc 100644 --- a/test/unittest/rtps/flowcontrol/CMakeLists.txt +++ b/test/unittest/rtps/flowcontrol/CMakeLists.txt @@ -45,7 +45,10 @@ target_include_directories(FlowControllerFactoryTests PRIVATE ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ) -target_link_libraries(FlowControllerFactoryTests GTest::gmock fastcdr) +target_link_libraries(FlowControllerFactoryTests + fastcdr + GTest::gmock + ) if(MSVC OR MSVC_IDE) target_link_libraries(FlowControllerFactoryTests ${PRIVACY} iphlpapi Shlwapi @@ -73,7 +76,10 @@ target_include_directories(FlowControllerPublishModesTests PRIVATE ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ) -target_link_libraries(FlowControllerPublishModesTests GTest::gmock fastcdr) +target_link_libraries(FlowControllerPublishModesTests + fastcdr + GTest::gmock + ) if(MSVC OR MSVC_IDE) target_link_libraries(FlowControllerPublishModesTests ${PRIVACY} iphlpapi Shlwapi @@ -97,7 +103,10 @@ target_include_directories(FlowControllerSchedulersTests PRIVATE ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ) -target_link_libraries(FlowControllerSchedulersTests GTest::gmock fastcdr) +target_link_libraries(FlowControllerSchedulersTests + fastcdr + GTest::gmock + ) if(MSVC OR MSVC_IDE) target_link_libraries(FlowControllerSchedulersTests ${PRIVACY} iphlpapi Shlwapi