Skip to content

Commit 0f190cf

Browse files
committed
global flags: set NOMINMAX for matplot regardless of check_symbol_exists, which wasn't being enough
1 parent f4f6b0d commit 0f190cf

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

CMakeLists.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ option(WITH_SYSTEM_NODESOUP "Use system-provided nodesoup instead of bundled" OF
6464
#######################################################
6565
# In development, we can set some options for all targets
6666
if (MASTER_PROJECT)
67+
message("Setting global options")
6768
# Maybe add sanitizers to all targets
6869
if (BUILD_WITH_SANITIZERS AND NOT EMSCRIPTEN)
6970
add_sanitizers()
@@ -81,13 +82,16 @@ if (MASTER_PROJECT)
8182

8283
# MSVC hack to disable windows min/max
8384
# http://www.suodenjoki.dk/us/archive/2010/min-max.htm
84-
if (BUILD_WITH_MSVC_HACKS)
85+
if (MSVC AND BUILD_WITH_MSVC_HACKS)
8586
# Check for min in Windows.h
86-
include(CheckSymbolExists)
87-
check_symbol_exists(min "Windows.h" HAVE_WINDOWS_MINMAX)
88-
if (HAVE_WINDOWS_MINMAX)
89-
add_compile_definitions(NOMINMAX)
90-
endif ()
87+
# include(CheckSymbolExists)
88+
# check_symbol_exists(min "WinDef.h" HAVE_WINDOWS_MINMAX)
89+
# if (NOT HAVE_WINDOWS_MINMAX)
90+
# check_symbol_exists(min "Windows.h" HAVE_WINDOWS_MINMAX)
91+
# endif ()
92+
# if (HAVE_WINDOWS_MINMAX)
93+
add_compile_definitions(NOMINMAX)
94+
# endif ()
9195
endif ()
9296
endif()
9397

0 commit comments

Comments
 (0)