From ce4f48b9bfdf76dcf4620ad13e1f7c7bf190a33b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sun, 22 Nov 2020 03:50:31 +0100 Subject: [PATCH] Add _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES for Windows --- CMakeLists.txt | 5 ----- cmake/Modules/CompilerOptions.cmake | 9 +++++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9dffafc5..b7b121772 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,11 +61,6 @@ add_definitions("-DCOPYRIGHT=\"${COPYRIGHT}\"") set(IDENTIFIER "com.${COMPANY}.${APPLICATION_NAME}") add_definitions("-DIDENTIFIER=\"${IDENTIFIER}\"") -add_compile_definitions(_USE_MATH_DEFINES) -if(WIN32) - add_compile_definitions(NOMINMAX) -endif() - find_package(Git) if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/") execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags diff --git a/cmake/Modules/CompilerOptions.cmake b/cmake/Modules/CompilerOptions.cmake index 82c8f0cb9..a99a88f41 100644 --- a/cmake/Modules/CompilerOptions.cmake +++ b/cmake/Modules/CompilerOptions.cmake @@ -2,6 +2,15 @@ include_guard(GLOBAL) include(DetectArchitecture) +if(WIN32) + add_compile_definitions( + NOMINMAX + _USE_MATH_DEFINES + _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES + _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT + ) +endif() + if(NOT MSVC) add_compile_options(-Wall -Wextra -Wvla -Woverloaded-virtual -ffast-math -ftree-vectorize) endif()