Skip to content

Commit 2b8a87c

Browse files
authored
Merge pull request #275 from offa/update
Update Trompeloeil v49
2 parents d0050c8 + fb51af0 commit 2b8a87c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ def requirements(self):
2222
self.requires("boost/1.85.0")
2323
if self.options.tests:
2424
self.requires("catch2/3.7.1")
25-
self.requires("trompeloeil/48")
25+
self.requires("trompeloeil/49")

test/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22
find_package(Catch2 REQUIRED)
33
find_package(trompeloeil REQUIRED)
44

5-
if( NOT TARGET trompeloeil::trompeloeil )
5+
if (NOT TARGET trompeloeil::trompeloeil)
66
add_library(trompeloeil::trompeloeil INTERFACE IMPORTED)
77
target_link_libraries(trompeloeil::trompeloeil INTERFACE trompeloeil)
88
endif()
99

10+
if (MSVC)
11+
target_compile_definitions(trompeloeil::trompeloeil INTERFACE NOMINMAX)
12+
endif()
13+
1014
add_subdirectory("mock")
1115

1216

0 commit comments

Comments
 (0)