Changeset 66715 in webkit

Timestamp:

Sep 2, 2010 11:03:38 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-02 Lucas De Marchi <​lucas.demarchi@profusion.mobi>

Reviewed by Antonio Gomes.

[EFL] Do not override custom compile flags
​https://bugs.webkit.org/show_bug.cgi?id=45125

Set a default build type if and only if user did not define one as
command line options and he did not give custom CFLAGS or CXXFLAGS.
Otherwise, flags from default build type would override user-defined
ones.

• CMakeLists.txt:

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/CMakeLists.txt

@@ -2 +2 @@
 PROJECT(WebKit)
 
-IF (NOT CMAKE_BUILD_TYPE)
+# Set a default build type if and only if user did not define one as command
+# line options and he did not give custom CFLAGS or CXXFLAGS. Otherwise, flags
+# from default build type would overwrite user-defined ones.
+IF (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS AND NOT CMAKE_CXX_FLAGS)
     SET(CMAKE_BUILD_TYPE Release)
 ENDIF ()

trunk/ChangeLog

@@ +1 @@
+2010-09-02  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Do not override custom compile flags
+        https://bugs.webkit.org/show_bug.cgi?id=45125
+
+        Set a default build type if and only if user did not define one as
+        command line options and he did not give custom CFLAGS or CXXFLAGS.
+        Otherwise, flags from default build type would override user-defined
+        ones.
+
+        * CMakeLists.txt:
+
 2010-09-02  Lucas De Marchi  <lucas.demarchi@profusion.mobi>