From c90f8fbd1a83ffeed6b0bb9d55e91f4a4a9b8641 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 3 Mar 2019 21:13:33 +0100 Subject: cmake: set RC_FLAGS after compiler is detected --- cmake/msvc.cmake | 4 ---- cmake/opentrack-platform.cmake | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index c77be83b..8bf431b9 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -29,10 +29,6 @@ add_definitions(-diagnostics:caret) #add_compile_options(-Qvec-report:2) #add_compile_options(-d2cgsummary) -if(NOT CMAKE_RC_FLAGS) - set(CMAKE_RC_FLAGS "/nologo /DWIN32") -endif() - if(CMAKE_PROJECT_NAME STREQUAL "opentrack") include("${CMAKE_CURRENT_LIST_DIR}/opentrack-policy.cmake" NO_POLICY_SCOPE) diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index a76da8b5..24f0f977 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -116,6 +116,8 @@ if(MINGW) endif() if(MSVC) + set(CMAKE_RC_FLAGS "/nologo /DWIN32") + add_definitions(-DNOMINMAX) add_definitions(-DWIN32_LEAN_AND_MEAN) add_definitions(-D_CRT_SECURE_NO_WARNINGS) -- cgit v1.2.3