Changeset 11076 for code/trunk

Timestamp:

Jan 19, 2016, 1:53:36 PM (9 years ago)

Author:

muemart

Message:

Add CMake configs for Clang. Most of it is reused from GCC.

Location:

code/trunk

Files:

• cmake/CompilerConfig.cmake (modified) (1 diff)
• cmake/CompilerConfigClang.cmake (added)
• cmake/tools/PrecompiledHeaderFiles.cmake (modified) (3 diffs)
• src/OrxonoxConfig.cmake (modified) (1 diff)

code/trunk/cmake/CompilerConfig.cmake

@@ -27 +27 @@
 
 # Configure the compiler specific build options
-IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUC)
+IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
   INCLUDE(CompilerConfigGCC)
-ELSEIF(MSVC)
+ELSEIF("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
   INCLUDE(CompilerConfigMSVC)
+ELSEIF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+  INCLUDE(CompilerConfigClang)
 ELSE()
   MESSAGE(STATUS "Warning: Your compiler is not officially supported.")

code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake

@@ -96 +96 @@
     ENDFOREACH(_file)
 
-  ELSEIF(CMAKE_COMPILER_IS_GNU)
+  ELSEIF(CMAKE_COMPILER_IS_GNU OR CMAKE_COMPILER_IS_CLANG)
 
-    # Append the gch-dir to make sure gcc finds the pch file
+    # Append the gch-dir to make sure compiler finds the pch file
     INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
@@ -122 +122 @@
 
 FUNCTION(PRECOMPILED_HEADER_FILES_POST_TARGET _target_name)
-    # This macro is only necessary for GCC
-    IF(CMAKE_COMPILER_IS_GNU)
+    # This macro is only necessary for GCC and Clang
+    IF(CMAKE_COMPILER_IS_GNU OR CMAKE_COMPILER_IS_CLANG)
 
       SET(_pch_file "${CMAKE_CURRENT_BINARY_DIR}/${_pch_header_filename}.gch")
@@ -156 +156 @@
       ADD_DEPENDENCIES(${_target_name} ${_target_name}PrecompiledHeader)
 
-    ENDIF(CMAKE_COMPILER_IS_GNU)
+    ENDIF(CMAKE_COMPILER_IS_GNU OR CMAKE_COMPILER_IS_CLANG)
 ENDFUNCTION(PRECOMPILED_HEADER_FILES_POST_TARGET)

code/trunk/src/OrxonoxConfig.cmake

@@ -55 +55 @@
     ENDIF()
   ENDIF()
-  IF(CMAKE_COMPILER_IS_GNU)
+  IF(CMAKE_COMPILER_IS_GNU OR CMAKE_COMPILER_IS_CLANG)
     INCLUDE(BuildUnitsConfigGCC.cmake)
   ELSEIF(MSVC)