From 4e4764dea60a0cf6a26dd8bb73224a3518c002ea Mon Sep 17 00:00:00 2001
From: kutscher <kutscher@irmb.tu-bs.de>
Date: Fri, 8 Nov 2019 12:12:41 +0100
Subject: [PATCH] adds general support for Clang
---
CMake/CMakeCompilerMacros.txt | 6 +++---
CMake/CMakeSetCompilerFlags.txt | 2 +-
CMake/compilerflags/{llvm.cmake => clang.cmake} | 10 +++++-----
CMake/compilerflags/gccGeneric.cmake | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
rename CMake/compilerflags/{llvm.cmake => clang.cmake} (90%)
diff --git a/CMake/CMakeCompilerMacros.txt b/CMake/CMakeCompilerMacros.txt
index 1bf8aee4c..68d4ee4e5 100644
--- a/CMake/CMakeCompilerMacros.txt
+++ b/CMake/CMakeCompilerMacros.txt
@@ -75,8 +75,9 @@ MACRO(SET_CAB_COMPILER)
ELSE()
SET( CAB_COMPILER "msvc19_32" )
ENDIF()
- ELSEIF(APPLE)
- SET( CAB_COMPILER "llvm" )
+ #ELSEIF(APPLE)
+ ELSEIF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+ SET( CAB_COMPILER "clang" )
ELSE()
EXEC_PROGRAM( ${CMAKE_CXX_COMPILER}
ARGS --version
@@ -91,7 +92,6 @@ MACRO(SET_CAB_COMPILER)
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CAB_COMPILER_NAME "gcc")
- #SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} -lgomp)
SET(USE_GCC ON)
ENDIF()
diff --git a/CMake/CMakeSetCompilerFlags.txt b/CMake/CMakeSetCompilerFlags.txt
index 5abf0a64a..fbee7836f 100644
--- a/CMake/CMakeSetCompilerFlags.txt
+++ b/CMake/CMakeSetCompilerFlags.txt
@@ -11,7 +11,7 @@ MACRO(SET_COMPILER_SPECIFIC_FLAGS compiler_type build_type)
OPTION(USE_OPENMP "activate open" ON)
- IF(APPLE)
+ IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
SET(USE_OPENMP OFF)
ENDIF()
diff --git a/CMake/compilerflags/llvm.cmake b/CMake/compilerflags/clang.cmake
similarity index 90%
rename from CMake/compilerflags/llvm.cmake
rename to CMake/compilerflags/clang.cmake
index 3c30f9171..98e133907 100644
--- a/CMake/compilerflags/llvm.cmake
+++ b/CMake/compilerflags/clang.cmake
@@ -1,6 +1,6 @@
###############################################################################################################
##
-## gcc74
+## clang
##
###############################################################################################################
@@ -8,7 +8,7 @@ MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
#############################################################################################################
# Flags
#############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -fPIC")
+ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -fPIC -Wbackslash-newline-escape")
LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -fPIC")
@@ -24,8 +24,8 @@ MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
# OpenMP support
#############################################################################################################
IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fopenmp")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-fopenmp")
+ #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fopenmp")
+ #LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-fopenmp")
ENDIF()
#############################################################################################################
@@ -44,7 +44,7 @@ MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
# disable warning
#############################################################################################################
LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wbackslash-newline-escape") #backslash and newline separated by space
+ #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wbackslash-newline-escape") #backslash and newline separated by space
LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wcomment") #'/*' within block comment
LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-Wbackslash-newline-escape") #backslash and newline separated by space
diff --git a/CMake/compilerflags/gccGeneric.cmake b/CMake/compilerflags/gccGeneric.cmake
index 852e16300..c39f0f0d8 100644
--- a/CMake/compilerflags/gccGeneric.cmake
+++ b/CMake/compilerflags/gccGeneric.cmake
@@ -1,6 +1,6 @@
###############################################################################################################
##
-## gcc74
+## gcc generic
##
###############################################################################################################
--
GitLab