From 2fba8e49e65e665faf49deb62165eea8b260c68a Mon Sep 17 00:00:00 2001 From: Javier Santiago Date: Thu, 16 Feb 2023 10:03:04 +0100 Subject: [PATCH] Added NOMINMAX flag to test Signed-off-by: Javier Santiago --- test/unittest/rtps/DataSharing/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/unittest/rtps/DataSharing/CMakeLists.txt b/test/unittest/rtps/DataSharing/CMakeLists.txt index f820c2caff0..76a77dab74f 100644 --- a/test/unittest/rtps/DataSharing/CMakeLists.txt +++ b/test/unittest/rtps/DataSharing/CMakeLists.txt @@ -12,7 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(SHMSEGMENTTESTS_SOURCE SHMSegmentTests.cpp) +set(SHMSEGMENTTESTS_SOURCE SHMSegmentTests.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/DataSharing/DataSharingPayloadPool.cpp + ) if(WIN32) add_definitions(-D_WIN32_WINNT=0x0601) @@ -25,6 +27,7 @@ target_compile_definitions(SHMSegmentTests PRIVATE FASTRTPS_NO_LIB $<$>,$>:__DEBUG> $<$:__INTERNALDEBUG> # Internal debug activated. $<$:_ENABLE_ATOMIC_ALIGNMENT_FIX> + $<$:NOMINMAX> # avoid conflict with std::min & std::max in visual studio ) target_include_directories(SHMSegmentTests PRIVATE ${Asio_INCLUDE_DIR}