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 99b63830b9c226ac55a2f8d65bbb4641baa9fea1..9e4b60ec8b84ea3952525b4c2c7e583ab3456354 100644 (file)
--- 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 3af1bfc493058735ab38e1993dae653ed9dbbb03..8eca1431ccf1ab907a3ed310ebf48d7f906acec0 100644 (file)
--- 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.