File tree Expand file tree Collapse file tree 1 file changed +10
-6
lines changed Expand file tree Collapse file tree 1 file changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -64,6 +64,7 @@ option(WITH_SYSTEM_NODESOUP "Use system-provided nodesoup instead of bundled" OF
64
64
#######################################################
65
65
# In development, we can set some options for all targets
66
66
if (MASTER_PROJECT )
67
+ message ("Setting global options" )
67
68
# Maybe add sanitizers to all targets
68
69
if (BUILD_WITH_SANITIZERS AND NOT EMSCRIPTEN )
69
70
add_sanitizers ()
@@ -81,13 +82,16 @@ if (MASTER_PROJECT)
81
82
82
83
# MSVC hack to disable windows min/max
83
84
# http://www.suodenjoki.dk/us/archive/2010/min-max.htm
84
- if (BUILD_WITH_MSVC_HACKS )
85
+ if (MSVC AND BUILD_WITH_MSVC_HACKS )
85
86
# 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 ()
91
95
endif ()
92
96
endif ()
93
97
You can’t perform that action at this time.
0 commit comments