Refs #20629: Fix mac & windows builds

Signed-off-by: cferreiragonz <[email protected]>
eProsima · Jun 28, 2024 · 688cd0f · 688cd0f
1 parent 2ff4ac6
commit 688cd0f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/cpp/rtps/RTPSDomain.cpp b/src/cpp/rtps/RTPSDomain.cpp
@@ -63,7 +63,7 @@ bool has_user_transport(
     const auto& transports = att.userTransports;
     const auto end_it = transports.end();
     return end_it != std::find_if(transports.begin(), end_it,
-                   [](const decltype(*end_it)& item)
+                   [](const std::shared_ptr<eprosima::fastdds::rtps::TransportDescriptorInterface>& item)
                    {
                        return nullptr != dynamic_cast<_Descriptor*>(item.get());
                    });

diff --git a/test/unittest/dds/subscriber/CMakeLists.txt b/test/unittest/dds/subscriber/CMakeLists.txt
@@ -90,7 +90,6 @@ target_include_directories(DataReaderTests PRIVATE
     ${Asio_INCLUDE_DIR}
     ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
     ${PROJECT_SOURCE_DIR}/src/cpp
-    ${Asio_INCLUDE_DIR}
     )
 target_link_libraries(DataReaderTests fastdds fastcdr foonathan_memory
     GTest::gmock

diff --git a/test/unittest/rtps/attributes/CMakeLists.txt b/test/unittest/rtps/attributes/CMakeLists.txt
@@ -63,18 +63,19 @@ set(SERVER_ATTRIBUTES_TESTS_SOURCE
     ${PROJECT_SOURCE_DIR}/src/cpp/utils/SystemInfo.cpp
     )
 
-if(WIN32)
-    add_definitions(-D_WIN32_WINNT=0x0601)
-endif()
-
 add_executable(${SERVER_ATTRIBUTES_TESTS_EXEC} ${SERVER_ATTRIBUTES_TESTS_SOURCE})
-
-target_include_directories(
-    ${SERVER_ATTRIBUTES_TESTS_EXEC}
-    PRIVATE
+target_compile_definitions(${SERVER_ATTRIBUTES_TESTS_EXEC} PRIVATE
+    BOOST_ASIO_STANDALONE
+    ASIO_STANDALONE
+    $<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
+    $<$<BOOL:${INTERNAL_DEBUG}>:__INTERNALDEBUG> # Internal debug activated.
+    )
+target_include_directories( ${SERVER_ATTRIBUTES_TESTS_EXEC} PRIVATE
+    ${Asio_INCLUDE_DIR}
     ${PROJECT_SOURCE_DIR}/include
     ${PROJECT_BINARY_DIR}/include
-    ${PROJECT_SOURCE_DIR}/src/cpp)
+    ${PROJECT_SOURCE_DIR}/src/cpp
+    )
 
 target_link_libraries(
     ${SERVER_ATTRIBUTES_TESTS_EXEC}