This is an automated email from the ASF dual-hosted git repository.
absurdfarce pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-cpp-driver.git
The following commit(s) were added to refs/heads/trunk by this push:
new 22532c4e CASSCPP-2 cmake build needs to be updated to handle clang
variants
22532c4e is described below
commit 22532c4e8915fe4acdef4a2bc5b6cf3f8f19f59f
Author: toptobes <[email protected]>
AuthorDate: Thu Jun 18 12:14:47 2026 -0500
CASSCPP-2 cmake build needs to be updated to handle clang variants
patch by Kavin Gupta; reviewed by Bret McGuire and Yifan Cai
---
CMakeLists.txt | 6 +++---
src/CMakeLists.txt | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3281751b..b0c3d09a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,7 +134,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(CASS_USE_STD_ATOMIC ON)
endif()
endif()
-elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang$")
# Version determined from: http://clang.llvm.org/cxx_status.html
# 3.2 includes the full C++11 memory model, but 3.1 had atomic
# support.
@@ -161,7 +161,7 @@ endif()
# Top-level compiler flags
#------------------------
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang$" OR
"${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
# Enable C++11 support to use std::atomic
if(CASS_USE_STD_ATOMIC)
@@ -177,7 +177,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
endif()
endif()
- if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang$")
# Clang/Intel specific compiler options
# I disabled long-long warning because boost generates about 50 such
warnings
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra
-Wno-long-long -Wno-unused-parameter")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d6627187..040ceb56 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -69,7 +69,7 @@ if(WIN32)
endif()
endif()
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang$")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wconversion -Wno-sign-conversion
-Wno-shorten-64-to-32 -Wno-undefined-var-template -Werror")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-implicit-int-float-conversion")
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # To many superfluous
warnings generated with GCC when using -Wconversion (see:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=40752)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
