diff --git a/CMake/CMakeCompilerMacros.txt b/CMake/CMakeCompilerMacros.txt
index 1bf8aee4cfaf228c27cd39bc13e6f98464960b45..68d4ee4e5a8ab1ab8611d32d90a322f18e28e9d8 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 5abf0a64a0acb27a46441f97ccf2adc5eb06a0d2..fbee7836f0694a9c96004a024f81bec3c68e3414 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 3c30f9171582a12270f7b38c22806c9f66f1a59d..98e13390792e78d65657c9660a1d75f238e62307 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 852e16300aef886ddae412a88ef611b423e210c0..c39f0f0d8e8ec55ec35a7f8e80fcdc31838089f9 100644
--- a/CMake/compilerflags/gccGeneric.cmake
+++ b/CMake/compilerflags/gccGeneric.cmake
@@ -1,6 +1,6 @@
 ###############################################################################################################
 ## 
-##  gcc74
+##  gcc generic
 ##
 ###############################################################################################################