This is an automated email from the ASF dual-hosted git repository.
emmenlau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new c5a5f79d7 build/cmake/DefinePlatformSpecifc.cmake: Separated MSVC and
Clang-Cl settings for Windows
new 006bc8937 Merge pull request #2865 from
BioDataAnalysis/emmenlau_minor_clangcl_improvement
c5a5f79d7 is described below
commit c5a5f79d7a8dbe0be6b800413b01736a440310ec
Author: Mario Emmenlauer <[email protected]>
AuthorDate: Tue Oct 10 12:01:13 2023 +0200
build/cmake/DefinePlatformSpecifc.cmake: Separated MSVC and Clang-Cl
settings for Windows
---
build/cmake/DefinePlatformSpecifc.cmake | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/build/cmake/DefinePlatformSpecifc.cmake
b/build/cmake/DefinePlatformSpecifc.cmake
index 84409e6ff..a78d80cac 100644
--- a/build/cmake/DefinePlatformSpecifc.cmake
+++ b/build/cmake/DefinePlatformSpecifc.cmake
@@ -25,8 +25,12 @@ 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 "MSVC" OR
"${CMAKE_${lang}_SIMULATE_ID}" STREQUAL "MSVC")
+ if("CMAKE_${lang}_COMPILER_ID" STREQUAL "MSVC")
+ # These flags are not supported (or needed) with Clang-Cl on Windows:
set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /MP") # parallel build
+ endif()
+
+ if("CMAKE_${lang}_COMPILER_ID" STREQUAL "MSVC" OR
"${CMAKE_${lang}_SIMULATE_ID}" STREQUAL "MSVC")
set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /W3") # warning level 3
include(CheckCXXCompilerFlag)
set(CMAKE_REQUIRED_QUIET ON)
