Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix detection of MSVC

Browse source 
STREQUAL on MSVC, WIN32, MINGW, etc. results in CMP0054 and non-equal
branching

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-06-23 14:28:33 +03:00
parent b5ade53153
commit cc2c26ecf1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mkspecs/mkspecs.cmake
View file

@ -40,13 +40,14 @@ if(NOT KATIE_PLATFORM)
endif()
if(NOT KATIE_COMPILER)
# using MATCHES in all checks due to CMP0054
if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|AppleClang)")
set(KATIE_COMPILER "clang")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
set(KATIE_COMPILER "gcc")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
set(KATIE_COMPILER "icc")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
set(KATIE_COMPILER "msvc")
else()
message(FATAL_ERROR "Unknown compiler '${CMAKE_CXX_COMPILER_ID}'")