[win] Make _USE_MATH_DEFINES definition global (#1021)
This commit is contained in:
@@ -76,6 +76,8 @@ target_compile_options(
|
||||
$<$<CXX_COMPILER_ID:MSVC>:/WX> # all warnings as errors
|
||||
$<$<CXX_COMPILER_ID:MSVC>:/EHsc> # exceptions
|
||||
$<$<CXX_COMPILER_ID:MSVC>:/wd4068> # pragma
|
||||
$<$<CXX_COMPILER_ID:MSVC>:/D_USE_MATH_DEFINES>
|
||||
$<$<AND:$<NOT:$<CXX_COMPILER_ID:MSVC>>,$<PLATFORM_ID:Windows>>:-D_USE_MATH_DEFINES>
|
||||
$<$<CXX_COMPILER_ID:MSVC>:/D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS>
|
||||
$<$<CXX_COMPILER_ID:MSVC>:/D_CRT_SECURE_NO_WARNINGS>
|
||||
)
|
||||
|
||||
@@ -29,6 +29,7 @@ target_link_libraries(
|
||||
Mapbox::Base::Extras::args
|
||||
Mapbox::Base::Extras::filesystem
|
||||
mbgl-core
|
||||
mbgl-compiler-options
|
||||
)
|
||||
|
||||
set_property(TARGET mbgl-expression-test PROPERTY FOLDER Executables)
|
||||
|
||||
@@ -65,7 +65,6 @@ if(WIN32)
|
||||
target_compile_definitions(
|
||||
mbgl-glfw
|
||||
PRIVATE
|
||||
_USE_MATH_DEFINES
|
||||
NOMINMAX
|
||||
CURL_STATICLIB
|
||||
)
|
||||
|
||||
@@ -178,7 +178,7 @@ function(add_node_module NAME)
|
||||
|
||||
if(WIN32)
|
||||
target_include_directories(${_TARGET} SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/platform/windows/include")
|
||||
target_compile_definitions(${_TARGET} PRIVATE _USE_MATH_DEFINES NOMINMAX)
|
||||
target_compile_definitions(${_TARGET} PRIVATE NOMINMAX)
|
||||
target_link_libraries(${_TARGET} PRIVATE "${_CACHE_DIR}/lib/node/${_NODE_VERSION}/win-${_ARCH}/node.lib")
|
||||
endif()
|
||||
|
||||
|
||||
@@ -42,14 +42,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
add_definitions("/DQT_COMPILING_QIMAGE_COMPAT_CPP")
|
||||
add_definitions("/D_USE_MATH_DEFINES")
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
||||
add_definitions("-DQT_COMPILING_QIMAGE_COMPAT_CPP")
|
||||
add_definitions("-D_USE_MATH_DEFINES")
|
||||
endif()
|
||||
|
||||
# Debugging & ccache on Windows
|
||||
if (MSVC)
|
||||
foreach(config DEBUG RELWITHDEBINFO)
|
||||
foreach(lang C CXX)
|
||||
|
||||
@@ -9,7 +9,7 @@ endif()
|
||||
execute_process(COMMAND powershell -ExecutionPolicy Bypass -File ${CMAKE_CURRENT_LIST_DIR}/Get-VendorPackages.ps1 -Triplet ${VCPKG_TARGET_TRIPLET} -Renderer ${_RENDERER})
|
||||
unset(_RENDERER)
|
||||
|
||||
add_compile_definitions(NOMINMAX _USE_MATH_DEFINES GHC_WIN_DISABLE_WSTRING_STORAGE_TYPE)
|
||||
add_compile_definitions(NOMINMAX GHC_WIN_DISABLE_WSTRING_STORAGE_TYPE)
|
||||
|
||||
target_compile_options(
|
||||
mbgl-compiler-options
|
||||
|
||||
Reference in New Issue
Block a user