Title: [132414] trunk
- Revision
- 132414
- Author
- [email protected]
- Date
- 2012-10-24 15:49:03 -0700 (Wed, 24 Oct 2012)
Log Message
[BlackBerry] change CMAKE_<CCXX|C>_FLAGS_<RELEASE|DEBUG> from enviroment flags
https://bugs.webkit.org/show_bug.cgi?id=100256
Patch by Michael Carmody <[email protected]> on 2012-10-24
Reviewed by Rob Buis.
This allow override of compile flags without having to edit CMake files.
* Source/cmake/OptionsBlackBerry.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (132413 => 132414)
--- trunk/ChangeLog 2012-10-24 22:45:13 UTC (rev 132413)
+++ trunk/ChangeLog 2012-10-24 22:49:03 UTC (rev 132414)
@@ -1,3 +1,14 @@
+2012-10-24 Michael Carmody <[email protected]>
+
+ [BlackBerry] change CMAKE_<CCXX|C>_FLAGS_<RELEASE|DEBUG> from enviroment flags
+ https://bugs.webkit.org/show_bug.cgi?id=100256
+
+ Reviewed by Rob Buis.
+
+ This allow override of compile flags without having to edit CMake files.
+
+ * Source/cmake/OptionsBlackBerry.cmake:
+
2012-10-24 Priit Laes <[email protected]>
[GTK] ./configure output for CSS Shaders is broken
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (132413 => 132414)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2012-10-24 22:45:13 UTC (rev 132413)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2012-10-24 22:49:03 UTC (rev 132414)
@@ -122,6 +122,17 @@
SET(CMAKE_C_FLAGS "-mfpu=neon ${CMAKE_C_FLAGS}")
SET(CMAKE_CXX_FLAGS "-mthumb -mthumb-interwork ${CMAKE_CXX_FLAGS}")
SET(CMAKE_C_FLAGS "-mthumb -mthumb-interwork ${CMAKE_C_FLAGS}")
+ # check for BB_RELEASE_FLAGS or BB_DEBUG_FLAGS to set CMAKE_C_FLAGS{DEBUG|RELEASE} CMAKE_CXX_FLAGS{DEBUG|RELEASE}
+ if( DEFINED ENV{BB_RELEASE_FLAGS} )
+ set(CMAKE_CXX_FLAGS_RELEASE "$ENV{BB_RELEASE_FLAGS} -DNDEBUG")
+ set(CMAKE_C_FLAGS_RELEASE "$ENV{BB_RELEASE_FLAGS} -DNDEBUG")
+ message( "== ENV override RELEASE ${CMAKE_CXX_FLAGS_RELEASE}" )
+ endif()
+ if( DEFINED ENV{BB_DEBUG_FLAGS} )
+ set(CMAKE_CXX_FLAGS_DEBUG "$ENV{BB_DEBUG_FLAGS}")
+ set(CMAKE_C_FLAGS_DEBUG "$ENV{BB_DEBUG_FLAGS}")
+ message( "== ENV override DEBUG ${CMAKE_CXX_FLAGS_DEBUG}")
+ endif()
ENDIF ()
ADD_DEFINITIONS(-DRESOURCE_PATH="/usr/share/webkit/resources/")
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
