Title: [124651] trunk
- Revision
- 124651
- Author
- [email protected]
- Date
- 2012-08-03 14:10:27 -0700 (Fri, 03 Aug 2012)
Log Message
[CMake][WIN] Disable C++ exceptions and RTTI
https://bugs.webkit.org/show_bug.cgi?id=93104
Reviewed by Ryosuke Niwa.
Both features are not used in WebKit, so remove them to safe some code.
Also enable compilation of plain c files with multiple processes.
* Source/cmake/OptionsWindows.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (124650 => 124651)
--- trunk/ChangeLog 2012-08-03 21:00:37 UTC (rev 124650)
+++ trunk/ChangeLog 2012-08-03 21:10:27 UTC (rev 124651)
@@ -1,3 +1,15 @@
+2012-08-03 Patrick Gansterer <[email protected]>
+
+ [CMake][WIN] Disable C++ exceptions and RTTI
+ https://bugs.webkit.org/show_bug.cgi?id=93104
+
+ Reviewed by Ryosuke Niwa.
+
+ Both features are not used in WebKit, so remove them to safe some code.
+ Also enable compilation of plain c files with multiple processes.
+
+ * Source/cmake/OptionsWindows.cmake:
+
2012-08-03 Mario Sanchez Prada <[email protected]>
Unreviewed build fix for GTK after r124479.
Modified: trunk/Source/cmake/OptionsWindows.cmake (124650 => 124651)
--- trunk/Source/cmake/OptionsWindows.cmake 2012-08-03 21:00:37 UTC (rev 124650)
+++ trunk/Source/cmake/OptionsWindows.cmake 2012-08-03 21:10:27 UTC (rev 124651)
@@ -1,7 +1,7 @@
ADD_DEFINITIONS(-DWTF_PLATFORM_WIN=1)
SET(WTF_PLATFORM_WIN 1)
-ADD_DEFINITIONS(-DNOMINMAX -DUNICODE)
+ADD_DEFINITIONS(-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DUNICODE)
INCLUDE_DIRECTORIES(${_javascript_CORE_DIR}/os-win32)
@@ -10,7 +10,11 @@
/wd4018 /wd4065 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4275 /wd4288 /wd4291
/wd4305 /wd4344 /wd4355 /wd4389 /wd4396 /wd4503 /wd4505 /wd4510 /wd4512 /wd4610 /wd4706 /wd4800 /wd4951 /wd4952 /wd4996)
+ STRING(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions
+ STRING(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI
+
IF (NOT MSVC_VERSION LESS 1500)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
ENDIF ()
ENDIF ()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
