Changeset 118640 in webkit

Timestamp:

May 27, 2012, 6:56:44 PM (14 years ago)

Author:

rakuco@webkit.org

Message:

[CMake] Make WEBKIT_SET_EXTRA_COMPILER_FLAGS work with clang.
​https://bugs.webkit.org/show_bug.cgi?id=87597

Reviewed by Daniel Bates.

Building with clang requires at least the -fPIC option being
passed correctly, just like it is needed with gcc. clang is also
compatible with most of gcc's compiler options, so we only need to
check for clang besides g++ in the macro definition.

• Source/cmake/WebKitHelpers.cmake: Check for "Clang" and use

CMAKE_COMPILER_IS_GNUCXX for the previous check, as it is shorter
and achieves the same effect.

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2012-05-27  Raphael Kubo da Costa  <rakuco@webkit.org>
+
+        [CMake] Make WEBKIT_SET_EXTRA_COMPILER_FLAGS work with clang.
+        https://bugs.webkit.org/show_bug.cgi?id=87597
+
+        Reviewed by Daniel Bates.
+
+        Building with clang requires at least the -fPIC option being
+        passed correctly, just like it is needed with gcc. clang is also
+        compatible with most of gcc's compiler options, so we only need to
+        check for clang besides g++ in the macro definition.
+
+        * Source/cmake/WebKitHelpers.cmake: Check for "Clang" and use
+        CMAKE_COMPILER_IS_GNUCXX for the previous check, as it is shorter
+        and achieves the same effect.
+
 2012-05-25  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/Source/cmake/WebKitHelpers.cmake

@@ -2 +2 @@
 # Currently, only GCC is supported.
 MACRO(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
-  IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  IF (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     GET_TARGET_PROPERTY(OLD_COMPILE_FLAGS ${_target} COMPILE_FLAGS)
     IF (${OLD_COMPILE_FLAGS} STREQUAL "OLD_COMPILE_FLAGS-NOTFOUND")