Changeset 222494 in webkit

Timestamp:

Sep 26, 2017 12:05:46 AM (7 years ago)

Author:

zandobersek@gmail.com

Message:

[CMake] Use implicit include directories for Clang as well
​https://bugs.webkit.org/show_bug.cgi?id=177426

Reviewed by Michael Catanzaro.

In WebKitCompilerFlags.cmake, also gather and use the system
include directories for C and C++ build targets when compiling
with Clang. This fixes compilation errors when cross-building
WebKit with a Clang-based toolchain.

COMPILER_IS_GCC_OR_CLANG is used to check for GCC or Clang
compilers. That only checks for the C++ compiler, but it's not
reasonable to expect two widely different compilers being used
for C and C++ compilation.

• Source/cmake/WebKitCompilerFlags.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/WebKitCompilerFlags.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2017-09-26  Zan Dobersek  <zdobersek@igalia.com>
+
+        [CMake] Use implicit include directories for Clang as well
+        https://bugs.webkit.org/show_bug.cgi?id=177426
+
+        Reviewed by Michael Catanzaro.
+
+        In WebKitCompilerFlags.cmake, also gather and use the system
+        include directories for C and C++ build targets when compiling
+        with Clang. This fixes compilation errors when cross-building
+        WebKit with a Clang-based toolchain.
+
+        COMPILER_IS_GCC_OR_CLANG is used to check for GCC or Clang
+        compilers. That only checks for the C++ compiler, but it's not
+        reasonable to expect two widely different compilers being used
+        for C and C++ compilation.
+
+        * Source/cmake/WebKitCompilerFlags.cmake:
+
 2017-09-25  Timothy Horton  <timothy_horton@apple.com>
 

trunk/Source/cmake/WebKitCompilerFlags.cmake

@@ -194 +194 @@
 endmacro()
 
-if (CMAKE_COMPILER_IS_GNUCC)
+if (COMPILER_IS_GCC_OR_CLANG)
    DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c" "${CMAKE_C_COMPILER}" "${CMAKE_C_FLAGS}" SYSTEM_INCLUDE_DIRS)
    set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
-endif ()
-
-if (CMAKE_COMPILER_IS_GNUCXX)
    DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c++" "${CMAKE_CXX_COMPILER}" "${CMAKE_CXX_FLAGS}" SYSTEM_INCLUDE_DIRS)
    set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})