Skip to content

Commit 688cd0f

Browse files
committed
Refs #20629: Fix mac & windows builds
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
1 parent 2ff4ac6 commit 688cd0f

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

src/cpp/rtps/RTPSDomain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ bool has_user_transport(
6363
const auto& transports = att.userTransports;
6464
const auto end_it = transports.end();
6565
return end_it != std::find_if(transports.begin(), end_it,
66-
[](const decltype(*end_it)& item)
66+
[](const std::shared_ptr<eprosima::fastdds::rtps::TransportDescriptorInterface>& item)
6767
{
6868
return nullptr != dynamic_cast<_Descriptor*>(item.get());
6969
});

test/unittest/dds/subscriber/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ target_include_directories(DataReaderTests PRIVATE
9090
${Asio_INCLUDE_DIR}
9191
${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
9292
${PROJECT_SOURCE_DIR}/src/cpp
93-
${Asio_INCLUDE_DIR}
9493
)
9594
target_link_libraries(DataReaderTests fastdds fastcdr foonathan_memory
9695
GTest::gmock

test/unittest/rtps/attributes/CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,19 @@ set(SERVER_ATTRIBUTES_TESTS_SOURCE
6363
${PROJECT_SOURCE_DIR}/src/cpp/utils/SystemInfo.cpp
6464
)
6565

66-
if(WIN32)
67-
add_definitions(-D_WIN32_WINNT=0x0601)
68-
endif()
69-
7066
add_executable(${SERVER_ATTRIBUTES_TESTS_EXEC} ${SERVER_ATTRIBUTES_TESTS_SOURCE})
71-
72-
target_include_directories(
73-
${SERVER_ATTRIBUTES_TESTS_EXEC}
74-
PRIVATE
67+
target_compile_definitions(${SERVER_ATTRIBUTES_TESTS_EXEC} PRIVATE
68+
BOOST_ASIO_STANDALONE
69+
ASIO_STANDALONE
70+
$<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
71+
$<$<BOOL:${INTERNAL_DEBUG}>:__INTERNALDEBUG> # Internal debug activated.
72+
)
73+
target_include_directories( ${SERVER_ATTRIBUTES_TESTS_EXEC} PRIVATE
74+
${Asio_INCLUDE_DIR}
7575
${PROJECT_SOURCE_DIR}/include
7676
${PROJECT_BINARY_DIR}/include
77-
${PROJECT_SOURCE_DIR}/src/cpp)
77+
${PROJECT_SOURCE_DIR}/src/cpp
78+
)
7879

7980
target_link_libraries(
8081
${SERVER_ATTRIBUTES_TESTS_EXEC}

0 commit comments

Comments
 (0)