diff options
Diffstat (limited to 'cmake/opentrack-platform.cmake')
| -rw-r--r-- | cmake/opentrack-platform.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 7882196e..3e1c1b3f 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -35,7 +35,7 @@ if(APPLE) endif() endif() -if(MSVC AND MSVC_VERSION LESS "1900") +if(MSVC AND MSVC_VERSION LESS "1900" AND NOT ".${CMAKE_CXX_COMPILER_ID}" STREQUAL ".Clang") message(FATAL_ERROR "Visual Studio too old. Use Visual Studio 2015 Update 3 or newer.") endif() @@ -69,7 +69,7 @@ if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Zi -std:c++14") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Zi") - if(MSVC AND opentrack-64bit) + if(opentrack-64bit) set(ent "-HIGHENTROPYVA") else() set(ent "") @@ -81,7 +81,7 @@ if(MSVC) endif() if(WIN32) - if(CMAKE_COMPILER_IS_GNUCXX) + if(CMAKE_COMPILER_IS_GNUCXX AND NOT MSVC) set(CMAKE_RC_COMPILER_INIT i686-w64-mingw32-windres) set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> --use-temp-file -O coff <DEFINES> -i <SOURCE> -o <OBJECT>") endif() |