diff --git a/include/fastdds/rtps/common/LocatorWithMask.hpp b/include/fastdds/rtps/common/LocatorWithMask.hpp index 0013d195f81..cc311c9b7a3 100644 --- a/include/fastdds/rtps/common/LocatorWithMask.hpp +++ b/include/fastdds/rtps/common/LocatorWithMask.hpp @@ -70,7 +70,7 @@ class RTPS_DllAPI LocatorWithMask : public Locator uint8_t mask_ = 24; }; -std::ostream& operator <<( +RTPS_DllAPI std::ostream& operator <<( std::ostream& output, const LocatorWithMask& loc); diff --git a/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp b/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp index 6e38eb5e26b..3b832ff10ba 100644 --- a/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp +++ b/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp @@ -32,27 +32,27 @@ namespace rtps { * @note When using this structure to interact with Fast-DDS, \c name is the only attribute the user needs to provide. * The rest of the attributes are internally filled, and are in fact ignored even if already provided by the user. */ -struct RTPS_DllAPI AllowedNetworkInterface : public NetworkInterfaceWithFilter +struct AllowedNetworkInterface : public NetworkInterfaceWithFilter { using NetworkInterfaceWithFilter::NetworkInterfaceWithFilter; //! Destructor - virtual ~AllowedNetworkInterface() = default; + virtual RTPS_DllAPI ~AllowedNetworkInterface() = default; //! Copy constructor - AllowedNetworkInterface( + RTPS_DllAPI AllowedNetworkInterface( const AllowedNetworkInterface& iface) = default; //! Copy assignment - AllowedNetworkInterface& operator =( + RTPS_DllAPI AllowedNetworkInterface& operator =( const AllowedNetworkInterface& iface) = default; //! Move constructor - AllowedNetworkInterface( + RTPS_DllAPI AllowedNetworkInterface( AllowedNetworkInterface&& iface) = default; //! Move assignment - AllowedNetworkInterface& operator =( + RTPS_DllAPI AllowedNetworkInterface& operator =( AllowedNetworkInterface&& iface) = default; }; diff --git a/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp b/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp index 743fa30e84c..b9ef6f7eb70 100644 --- a/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp +++ b/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp @@ -32,27 +32,27 @@ namespace rtps { * @note When using this structure to interact with Fast-DDS, \c name is the only attribute the user needs to provide. * The rest of the attributes are internally filled, and are in fact ignored even if already provided by the user. */ -struct RTPS_DllAPI BlockedNetworkInterface : public NetworkInterface +struct BlockedNetworkInterface : public NetworkInterface { using NetworkInterface::NetworkInterface; //! Destructor - virtual ~BlockedNetworkInterface() = default; + virtual RTPS_DllAPI ~BlockedNetworkInterface() = default; //! Copy constructor - BlockedNetworkInterface( + RTPS_DllAPI BlockedNetworkInterface( const BlockedNetworkInterface& iface) = default; //! Copy assignment - BlockedNetworkInterface& operator =( + RTPS_DllAPI BlockedNetworkInterface& operator =( const BlockedNetworkInterface& iface) = default; //! Move constructor - BlockedNetworkInterface( + RTPS_DllAPI BlockedNetworkInterface( BlockedNetworkInterface&& iface) = default; //! Move assignment - BlockedNetworkInterface& operator =( + RTPS_DllAPI BlockedNetworkInterface& operator =( BlockedNetworkInterface&& iface) = default; }; diff --git a/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp b/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp index 643b6123544..f2ec8e67c32 100644 --- a/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp +++ b/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp @@ -34,7 +34,7 @@ enum class NetmaskFilterKind ON }; -std::ostream& operator <<( +RTPS_DllAPI std::ostream& operator <<( std::ostream& output, const NetmaskFilterKind& netmask_filter_kind); diff --git a/include/fastdds/rtps/transport/network/NetworkInterface.hpp b/include/fastdds/rtps/transport/network/NetworkInterface.hpp index b226aecca1e..15fd5188827 100644 --- a/include/fastdds/rtps/transport/network/NetworkInterface.hpp +++ b/include/fastdds/rtps/transport/network/NetworkInterface.hpp @@ -34,39 +34,39 @@ namespace rtps { * @note When using this structure to interact with Fast-DDS, \c name is the only attribute the user needs to provide. * The rest of the attributes are internally filled, and are in fact ignored even if already provided by the user. */ -struct RTPS_DllAPI NetworkInterface +struct NetworkInterface { //! Constructor by name - NetworkInterface( + RTPS_DllAPI NetworkInterface( const std::string& name); //! Constructor by device name, IP address string and locator with mask - NetworkInterface( + RTPS_DllAPI NetworkInterface( const std::string& device, const std::string& ip, const LocatorWithMask& locator); //! Destructor - virtual ~NetworkInterface() = default; + virtual RTPS_DllAPI ~NetworkInterface() = default; //! Copy constructor - NetworkInterface( + RTPS_DllAPI NetworkInterface( const NetworkInterface& iface) = default; //! Copy assignment - NetworkInterface& operator =( + RTPS_DllAPI NetworkInterface& operator =( const NetworkInterface& iface) = default; //! Move constructor - NetworkInterface( + RTPS_DllAPI NetworkInterface( NetworkInterface&& iface) = default; //! Move assignment - NetworkInterface& operator =( + RTPS_DllAPI NetworkInterface& operator =( NetworkInterface&& iface) = default; //! Comparison operator - bool operator ==( + RTPS_DllAPI bool operator ==( const NetworkInterface& iface) const; //! Interface device name or IP address in string format (to be filled by the user) diff --git a/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp b/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp index 286423af322..a37113b8e0d 100644 --- a/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp +++ b/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp @@ -35,15 +35,15 @@ namespace rtps { * @note When using this structure to interact with Fast-DDS, \c name is the only attribute the user needs to provide. * The rest of the attributes are internally filled, and are in fact ignored even if already provided by the user. */ -struct RTPS_DllAPI NetworkInterfaceWithFilter : public NetworkInterface +struct NetworkInterfaceWithFilter : public NetworkInterface { //! Constructor by name and netmask filter - NetworkInterfaceWithFilter( + RTPS_DllAPI NetworkInterfaceWithFilter( const std::string& name, NetmaskFilterKind netmask_filter); //! Constructor by name - NetworkInterfaceWithFilter( + RTPS_DllAPI NetworkInterfaceWithFilter( const std::string& name); //! Constructor by device name, IP address string, locator with mask and netmask filter @@ -54,32 +54,32 @@ struct RTPS_DllAPI NetworkInterfaceWithFilter : public NetworkInterface NetmaskFilterKind netmask_filter); //! Constructor by device name, IP address string and locator with mask - NetworkInterfaceWithFilter( + RTPS_DllAPI NetworkInterfaceWithFilter( const std::string& device, const std::string& ip, const LocatorWithMask& locator); //! Destructor - virtual ~NetworkInterfaceWithFilter() = default; + virtual RTPS_DllAPI ~NetworkInterfaceWithFilter() = default; //! Copy constructor - NetworkInterfaceWithFilter( + RTPS_DllAPI NetworkInterfaceWithFilter( const NetworkInterfaceWithFilter& iface) = default; //! Copy assignment - NetworkInterfaceWithFilter& operator =( + RTPS_DllAPI NetworkInterfaceWithFilter& operator =( const NetworkInterfaceWithFilter& iface) = default; //! Move constructor - NetworkInterfaceWithFilter( + RTPS_DllAPI NetworkInterfaceWithFilter( NetworkInterfaceWithFilter&& iface) = default; //! Move assignment - NetworkInterfaceWithFilter& operator =( + RTPS_DllAPI NetworkInterfaceWithFilter& operator =( NetworkInterfaceWithFilter&& iface) = default; //! Comparison operator - bool operator ==( + RTPS_DllAPI bool operator ==( const NetworkInterfaceWithFilter& iface) const; //! Netmask filter configuration diff --git a/test/unittest/dds/collections/CMakeLists.txt b/test/unittest/dds/collections/CMakeLists.txt index 0470db98460..42ba3a0b352 100644 --- a/test/unittest/dds/collections/CMakeLists.txt +++ b/test/unittest/dds/collections/CMakeLists.txt @@ -35,10 +35,13 @@ set(LOANABLE_SEQUENCE_TESTS_SOURCE add_executable(LoanableSequenceTests ${LOANABLE_SEQUENCE_TESTS_SOURCE}) target_compile_definitions(LoanableSequenceTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(LoanableSequenceTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(LoanableSequenceTests GTest::gtest) diff --git a/test/unittest/dds/core/condition/CMakeLists.txt b/test/unittest/dds/core/condition/CMakeLists.txt index ca0b6c96d05..daff3d2a155 100644 --- a/test/unittest/dds/core/condition/CMakeLists.txt +++ b/test/unittest/dds/core/condition/CMakeLists.txt @@ -46,10 +46,13 @@ set(CONDITION_TESTS_SOURCE add_executable(ConditionTests ${CONDITION_TESTS_SOURCE}) target_compile_definitions(ConditionTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(ConditionTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp @@ -75,10 +78,13 @@ set(CONDITION_NOTIFIER_TESTS_SOURCE add_executable(ConditionNotifierTests ${CONDITION_NOTIFIER_TESTS_SOURCE}) target_compile_definitions(ConditionNotifierTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(ConditionNotifierTests PRIVATE + ${Asio_INCLUDE_DIR} mock/WaitSetImpl ${GTEST_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/include @@ -107,10 +113,13 @@ set(STATUS_CONDITION_IMPL_TESTS_SOURCE add_executable(StatusConditionImplTests ${STATUS_CONDITION_IMPL_TESTS_SOURCE}) target_compile_definitions(StatusConditionImplTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(StatusConditionImplTests PRIVATE + ${Asio_INCLUDE_DIR} mock/ConditionNotifier ${GTEST_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/include @@ -138,10 +147,13 @@ set(WAITSET_IMPL_TESTS_SOURCE add_executable(WaitSetImplTests ${WAITSET_IMPL_TESTS_SOURCE}) target_compile_definitions(WaitSetImplTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(WaitSetImplTests PRIVATE + ${Asio_INCLUDE_DIR} mock/ConditionNotifier ${GTEST_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/include diff --git a/test/unittest/dds/core/entity/CMakeLists.txt b/test/unittest/dds/core/entity/CMakeLists.txt index d4576d52fae..f3b201f7f99 100644 --- a/test/unittest/dds/core/entity/CMakeLists.txt +++ b/test/unittest/dds/core/entity/CMakeLists.txt @@ -50,10 +50,13 @@ endif() add_executable(EntityTests ${ENTITY_TESTS_SOURCE}) target_compile_definitions(EntityTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(EntityTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp diff --git a/test/unittest/dds/publisher/CMakeLists.txt b/test/unittest/dds/publisher/CMakeLists.txt index e25fd0f6689..72e1e505d3f 100644 --- a/test/unittest/dds/publisher/CMakeLists.txt +++ b/test/unittest/dds/publisher/CMakeLists.txt @@ -331,10 +331,13 @@ endif() add_executable(PublisherTests ${PUBLISHERTESTS_SOURCE}) target_compile_definitions(PublisherTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(PublisherTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ${PROJECT_SOURCE_DIR}/thirdparty/taocpp-pegtl diff --git a/test/unittest/dds/subscriber/CMakeLists.txt b/test/unittest/dds/subscriber/CMakeLists.txt index 267a53e2363..b77b83e8739 100644 --- a/test/unittest/dds/subscriber/CMakeLists.txt +++ b/test/unittest/dds/subscriber/CMakeLists.txt @@ -66,6 +66,8 @@ endif() add_executable(SubscriberTests ${SUBSCRIBERTESTS_SOURCE}) target_compile_definitions(SubscriberTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) @@ -87,6 +89,7 @@ target_compile_definitions(DataReaderTests PRIVATE $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(DataReaderTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ${Asio_INCLUDE_DIR} @@ -98,10 +101,13 @@ gtest_discover_tests(DataReaderTests) add_executable(DataReaderInstanceTests ${DATAREADERINSTANCETESTS_SOURCE}) target_compile_definitions(DataReaderInstanceTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(DataReaderInstanceTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ) @@ -112,6 +118,8 @@ gtest_discover_tests(DataReaderInstanceTests) add_executable(DataReaderHistoryTests ${DATAREADERHISTORYTESTS_SOURCE}) target_compile_definitions(DataReaderHistoryTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. $<$:NOMINMAX> # avoid conflic with std::min & std::max in visual studio @@ -119,6 +127,7 @@ target_compile_definitions(DataReaderHistoryTests PRIVATE $<$,$>:_ENABLE_ATOMIC_ALIGNMENT_FIX> ) target_include_directories(DataReaderHistoryTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/test/mock/rtps/RTPSReader ${PROJECT_SOURCE_DIR}/test/mock/rtps/StatelessReader ${PROJECT_SOURCE_DIR}/test/mock/dds/Topic diff --git a/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt b/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt index 5c5dae75bf4..f30b03366d9 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt +++ b/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt @@ -48,10 +48,13 @@ add_executable(DDSSQLFilterTests ${DDSSQLFILTER_LIB_SOURCES} ) target_compile_definitions(DDSSQLFilterTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(DDSSQLFilterTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ${PROJECT_SOURCE_DIR}/thirdparty/taocpp-pegtl diff --git a/test/unittest/logging/CMakeLists.txt b/test/unittest/logging/CMakeLists.txt index 29d6d608b9f..be92901677e 100644 --- a/test/unittest/logging/CMakeLists.txt +++ b/test/unittest/logging/CMakeLists.txt @@ -46,12 +46,15 @@ include_directories(mock/) add_executable(LogTests ${LOGTESTS_SOURCE}) target_compile_definitions(LogTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. HAVE_LOG_NO_INFO=0 FASTDDS_ENFORCE_LOG_INFO # logInfo is used in some tests ) target_include_directories(LogTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(LogTests GTest::gtest ${MOCKS} @@ -81,10 +84,13 @@ endif(TINYXML2_INCLUDE_DIR) add_executable(LogFileTests ${LOGFILETESTS_SOURCE}) target_compile_definitions(LogFileTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(LogFileTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(LogFileTests GTest::gtest ${MOCKS} diff --git a/test/unittest/logging/log_macros/CMakeLists.txt b/test/unittest/logging/log_macros/CMakeLists.txt index ab08c93bb73..0e0b64f5954 100644 --- a/test/unittest/logging/log_macros/CMakeLists.txt +++ b/test/unittest/logging/log_macros/CMakeLists.txt @@ -42,10 +42,13 @@ set(LOGMACROS_SOURCE add_executable(LogMacrosAllActiveTests ${LOGMACROS_SOURCE}) target_compile_definitions(LogMacrosAllActiveTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(LogMacrosAllActiveTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(LogMacrosAllActiveTests GTest::gtest ${MOCKS} @@ -63,10 +66,13 @@ set(LOGMACROS_SOURCE add_executable(LogMacrosNoInfoTests ${LOGMACROS_SOURCE}) target_compile_definitions(LogMacrosNoInfoTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(LogMacrosNoInfoTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(LogMacrosNoInfoTests GTest::gtest ${MOCKS} @@ -84,10 +90,13 @@ set(LOGMACROS_SOURCE add_executable(LogMacrosNoWarningTests ${LOGMACROS_SOURCE}) target_compile_definitions(LogMacrosNoWarningTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(LogMacrosNoWarningTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(LogMacrosNoWarningTests GTest::gtest ${MOCKS} @@ -105,10 +114,13 @@ set(LOGMACROS_SOURCE add_executable(LogMacrosNoErrorTests ${LOGMACROS_SOURCE}) target_compile_definitions(LogMacrosNoErrorTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(LogMacrosNoErrorTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(LogMacrosNoErrorTests GTest::gtest ${MOCKS} @@ -126,10 +138,13 @@ set(LOGMACROS_SOURCE add_executable(LogMacrosDefaultTests ${LOGMACROS_SOURCE}) target_compile_definitions(LogMacrosDefaultTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(LogMacrosDefaultTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(LogMacrosDefaultTests GTest::gtest ${MOCKS} @@ -149,10 +164,13 @@ set(LOGMACROS_SOURCE add_executable(LogMacrosInternalDebugOffTests ${LOGMACROS_SOURCE}) target_compile_definitions(LogMacrosInternalDebugOffTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(LogMacrosInternalDebugOffTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(LogMacrosInternalDebugOffTests GTest::gtest ${MOCKS} @@ -169,10 +187,13 @@ set(LOGMACROS_SOURCE add_executable(OldLogMacrosTests ${LOGMACROS_SOURCE}) target_compile_definitions(OldLogMacrosTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(OldLogMacrosTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(OldLogMacrosTests GTest::gtest ${MOCKS} @@ -190,10 +211,13 @@ set(LOGMACROS_SOURCE add_executable(OldLogMacrosDisableTests ${LOGMACROS_SOURCE}) target_compile_definitions(OldLogMacrosDisableTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(OldLogMacrosDisableTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(OldLogMacrosDisableTests GTest::gtest ${MOCKS} diff --git a/test/unittest/rtps/common/CMakeLists.txt b/test/unittest/rtps/common/CMakeLists.txt index 0cb184870a8..1aaa1f32094 100644 --- a/test/unittest/rtps/common/CMakeLists.txt +++ b/test/unittest/rtps/common/CMakeLists.txt @@ -110,10 +110,13 @@ gtest_discover_tests(SequenceNumberTests) add_executable(PortParametersTests ${PORTPARAMETERSTESTS_SOURCE}) target_compile_definitions(PortParametersTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(PortParametersTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(PortParametersTests GTest::gtest) diff --git a/test/unittest/rtps/flowcontrol/CMakeLists.txt b/test/unittest/rtps/flowcontrol/CMakeLists.txt index ae011ab866f..b5c706ae2d1 100644 --- a/test/unittest/rtps/flowcontrol/CMakeLists.txt +++ b/test/unittest/rtps/flowcontrol/CMakeLists.txt @@ -44,10 +44,13 @@ set(FLOWCONTROLLERFACTORYTESTS_SOURCE add_executable(FlowControllerFactoryTests ${FLOWCONTROLLERFACTORYTESTS_SOURCE}) target_compile_definitions(FlowControllerFactoryTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(FlowControllerFactoryTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/test/mock/rtps/RTPSWriter ${PROJECT_SOURCE_DIR}/test/mock/rtps/RTPSMessageGroup ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include @@ -75,10 +78,13 @@ set(FLOWCONTROLLERPUBLISHMODESTESTS_SOURCE add_executable(FlowControllerPublishModesTests ${FLOWCONTROLLERPUBLISHMODESTESTS_SOURCE}) target_compile_definitions(FlowControllerPublishModesTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(FlowControllerPublishModesTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/test/mock/rtps/RTPSWriter ${PROJECT_SOURCE_DIR}/test/mock/rtps/RTPSMessageGroup ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include @@ -102,10 +108,13 @@ set(FLOWCONTROLLERSCHEDULERSTESTS_SOURCE add_executable(FlowControllerSchedulersTests ${FLOWCONTROLLERSCHEDULERSTESTS_SOURCE}) target_compile_definitions(FlowControllerSchedulersTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(FlowControllerSchedulersTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/test/mock/rtps/RTPSWriter ${PROJECT_SOURCE_DIR}/test/mock/rtps/RTPSMessageGroup ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include diff --git a/test/unittest/rtps/history/CMakeLists.txt b/test/unittest/rtps/history/CMakeLists.txt index 9725ec3ae6f..73c78eceb21 100644 --- a/test/unittest/rtps/history/CMakeLists.txt +++ b/test/unittest/rtps/history/CMakeLists.txt @@ -98,10 +98,13 @@ endif() add_executable(ReaderHistoryTests ${READERHISTORYTESTS_SOURCE}) target_compile_definitions(ReaderHistoryTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(ReaderHistoryTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/test/mock/rtps/Endpoint ${PROJECT_SOURCE_DIR}/test/mock/rtps/ResourceEvent ${PROJECT_SOURCE_DIR}/test/mock/rtps/RTPSReader @@ -115,10 +118,13 @@ gtest_discover_tests(ReaderHistoryTests) add_executable(BasicPoolsTests ${BASICPOOLSTESTS_SOURCE}) target_compile_definitions(BasicPoolsTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(BasicPoolsTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/src/cpp ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include) target_link_libraries(BasicPoolsTests @@ -128,10 +134,13 @@ gtest_discover_tests(BasicPoolsTests) add_executable(CacheChangePoolTests ${CACHECHANGEPOOLTESTS_SOURCE}) target_compile_definitions(CacheChangePoolTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(CacheChangePoolTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/src/cpp ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include) target_link_libraries(CacheChangePoolTests @@ -141,10 +150,13 @@ gtest_discover_tests(CacheChangePoolTests) add_executable(TopicPayloadPoolTests ${TOPICPAYLOADPOOLTESTS_SOURCE}) target_compile_definitions(TopicPayloadPoolTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(TopicPayloadPoolTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/test/mock/rtps/TopicPayloadPoolProxy ${PROJECT_SOURCE_DIR}/src/cpp ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include) diff --git a/test/unittest/rtps/persistence/CMakeLists.txt b/test/unittest/rtps/persistence/CMakeLists.txt index 32b5a740a0c..502d5404d71 100644 --- a/test/unittest/rtps/persistence/CMakeLists.txt +++ b/test/unittest/rtps/persistence/CMakeLists.txt @@ -41,11 +41,14 @@ if(SQLITE3_SUPPORT) add_executable(PersistenceTests ${PERSISTENCETESTS_SOURCE}) target_compile_definitions(PersistenceTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(PersistenceTests PRIVATE - ${PROJECT_SOURCE_DIR}/test/mock/rtps/WriterHistory + ${Asio_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/test/mock/rtps/WriterHistory ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ) diff --git a/test/unittest/rtps/reader/CMakeLists.txt b/test/unittest/rtps/reader/CMakeLists.txt index 65f1dae3190..68827d15e73 100644 --- a/test/unittest/rtps/reader/CMakeLists.txt +++ b/test/unittest/rtps/reader/CMakeLists.txt @@ -40,10 +40,13 @@ endif() add_executable(WriterProxyTests ${WRITERPROXYTESTS_SOURCE}) target_compile_definitions(WriterProxyTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(WriterProxyTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/src/cpp/rtps/reader ${PROJECT_SOURCE_DIR}/test/mock/rtps/Endpoint ${PROJECT_SOURCE_DIR}/test/mock/rtps/external_locators @@ -95,10 +98,13 @@ endif() add_executable(WriterProxyStopTest ${WRITERPROXYSTOPTEST_SOURCE}) target_compile_definitions(WriterProxyStopTest PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(WriterProxyStopTest PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/src/cpp/rtps/reader ${PROJECT_SOURCE_DIR}/test/mock/rtps/Endpoint ${PROJECT_SOURCE_DIR}/test/mock/rtps/external_locators @@ -146,10 +152,13 @@ endif() add_executable(WriterProxyAcknackTests ${WRITERPROXYACKNACKTESTS_SOURCE}) target_compile_definitions(WriterProxyAcknackTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(WriterProxyAcknackTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/src/cpp/rtps/reader ${PROJECT_SOURCE_DIR}/test/mock/rtps/Endpoint ${PROJECT_SOURCE_DIR}/test/mock/rtps/external_locators diff --git a/test/unittest/security/cryptography/CMakeLists.txt b/test/unittest/security/cryptography/CMakeLists.txt index e67ed4b7d8a..f353b295f69 100644 --- a/test/unittest/security/cryptography/CMakeLists.txt +++ b/test/unittest/security/cryptography/CMakeLists.txt @@ -49,11 +49,14 @@ add_executable(BuiltinAESGCMGMAC ${COMMON_SOURCES_CRYPTO_PLUGIN_TEST_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/builtinAESGCMGMACTests.cpp) target_compile_definitions(BuiltinAESGCMGMAC PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(BuiltinAESGCMGMAC PRIVATE + ${Asio_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/test/mock/rtps/SecurityPluginFactory/rtps ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include diff --git a/test/unittest/security/logging/CMakeLists.txt b/test/unittest/security/logging/CMakeLists.txt index 9c39f938ec3..fa218fa762b 100644 --- a/test/unittest/security/logging/CMakeLists.txt +++ b/test/unittest/security/logging/CMakeLists.txt @@ -43,10 +43,13 @@ add_executable(BuiltinLogging ${COMMON_SOURCES_LOGGING_PLUGIN_TEST_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/BuiltinLogTopicTests.cpp) target_compile_definitions(BuiltinLogging PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(BuiltinLogging PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ) diff --git a/test/unittest/utils/CMakeLists.txt b/test/unittest/utils/CMakeLists.txt index e51e994d918..150b9cd7e1c 100644 --- a/test/unittest/utils/CMakeLists.txt +++ b/test/unittest/utils/CMakeLists.txt @@ -84,10 +84,13 @@ include_directories(mock/) add_executable(StringMatchingTests ${STRINGMATCHINGTESTS_SOURCE}) target_compile_definitions(StringMatchingTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. ) target_include_directories(StringMatchingTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp) target_link_libraries(StringMatchingTests GTest::gtest ${MOCKS}) @@ -165,7 +168,14 @@ target_link_libraries(FixedSizeQueueTests GTest::gtest ${MOCKS}) gtest_discover_tests(FixedSizeQueueTests) add_executable(SystemInfoTests ${SYSTEMINFOTESTS_SOURCE}) +target_compile_definitions(SystemInfoTests PRIVATE + BOOST_ASIO_STANDALONE + ASIO_STANDALONE + $<$>,$>:__DEBUG> + $<$:__INTERNALDEBUG> # Internal debug activated. + ) target_include_directories(SystemInfoTests PRIVATE + ${Asio_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src/cpp ${PROJECT_BINARY_DIR}/include) target_link_libraries(SystemInfoTests GTest::gtest) gtest_discover_tests(SystemInfoTests)