summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Emmenlauer <memmenlauer@biodataanalysis.de>2020-10-20 15:44:42 +0200
committerMario Emmenlauer <memmenlauer@biodataanalysis.de>2021-01-18 08:16:26 +0100
commit7f9abb1cc0f4b2793a48f45ddfcf0d2b287cc50c (patch)
tree8a45b0186f597f26590b0c747d3dfc72c5406d4f
parentd831230929bb332189c9509d07102e4be9e7f681 (diff)
downloadthrift-7f9abb1cc0f4b2793a48f45ddfcf0d2b287cc50c.tar.gz
build/cmake/DefinePlatformSpecifc.cmake: Ensure ClangCl on MSVC is recognized as MSVC (because it does not handle -Wall too well)
-rw-r--r--build/cmake/DefinePlatformSpecifc.cmake14
1 files changed, 7 insertions, 7 deletions
diff --git a/build/cmake/DefinePlatformSpecifc.cmake b/build/cmake/DefinePlatformSpecifc.cmake
index f43f50323..84409e6ff 100644
--- a/build/cmake/DefinePlatformSpecifc.cmake
+++ b/build/cmake/DefinePlatformSpecifc.cmake
@@ -25,13 +25,7 @@ set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Set debug library postfix")
# basic options
foreach(lang IN ITEMS C CXX)
- if(CMAKE_${lang}_COMPILER_ID STREQUAL "Clang")
- set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wall")
- set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -ferror-limit=1")
- elseif(CMAKE_${lang}_COMPILER_ID STREQUAL "GNU")
- set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wall -Wextra")
- set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -fmax-errors=1")
- elseif(CMAKE_${lang}_COMPILER_ID STREQUAL "MSVC")
+ if("CMAKE_${lang}_COMPILER_ID" STREQUAL "MSVC" OR "${CMAKE_${lang}_SIMULATE_ID}" STREQUAL "MSVC")
set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /MP") # parallel build
set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /W3") # warning level 3
include(CheckCXXCompilerFlag)
@@ -45,6 +39,12 @@ foreach(lang IN ITEMS C CXX)
set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /execution-charset:utf-8")
endif()
add_definitions("-DUNICODE -D_UNICODE")
+ elseif("CMAKE_${lang}_COMPILER_ID" STREQUAL "Clang")
+ set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wall")
+ set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -ferror-limit=1")
+ elseif("CMAKE_${lang}_COMPILER_ID" STREQUAL "GNU")
+ set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wall -Wextra")
+ set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -fmax-errors=1")
endif()
endforeach()