From: commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 3 Sep 2010 06:03:38 +0000 (+0000)
Subject: 2010-09-02  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=be77fb5c65fc9e3f439ffc1858e3d37b9982d719

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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@66715 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99b63830b9c2..9e4b60ec8b84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,10 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 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 ()
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
diff --git a/ChangeLog b/ChangeLog
index 3af1bfc49305..8eca1431ccf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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>
 
         Reviewed by Antonio Gomes.