Title: [95986] trunk
- Revision
- 95986
- Author
- [email protected]
- Date
- 2011-09-26 13:08:57 -0700 (Mon, 26 Sep 2011)
Log Message
[CMake] Detect the operating system in a more generic way.
https://bugs.webkit.org/show_bug.cgi?id=67482
Patch by Raphael Kubo da Costa <[email protected]> on 2011-09-26
Reviewed by Adam Barth.
So far the buildsystem only considered Windows, Linux and Mac OS X as
valid operating systems, but any Unix (or at least the BSDs) should also
work fine.
By using the OS values CMake itself defines we can check for Unix
systems in a more generic fashion.
* Source/CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/ChangeLog (95985 => 95986)
--- trunk/ChangeLog 2011-09-26 20:08:11 UTC (rev 95985)
+++ trunk/ChangeLog 2011-09-26 20:08:57 UTC (rev 95986)
@@ -1,3 +1,19 @@
+2011-09-26 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Detect the operating system in a more generic way.
+ https://bugs.webkit.org/show_bug.cgi?id=67482
+
+ Reviewed by Adam Barth.
+
+ So far the buildsystem only considered Windows, Linux and Mac OS X as
+ valid operating systems, but any Unix (or at least the BSDs) should also
+ work fine.
+
+ By using the OS values CMake itself defines we can check for Unix
+ systems in a more generic fashion.
+
+ * Source/CMakeLists.txt:
+
2011-09-26 Jay Soffian <[email protected]>
chrome.dll!WebCore::ApplyStyleCommand::applyBlockStyle ReadAV@NULL (64db547804532a84be2e53721e499e9e)
Modified: trunk/Source/CMakeLists.txt (95985 => 95986)
--- trunk/Source/CMakeLists.txt 2011-09-26 20:08:11 UTC (rev 95985)
+++ trunk/Source/CMakeLists.txt 2011-09-26 20:08:57 UTC (rev 95986)
@@ -73,11 +73,11 @@
# -----------------------------------------------------------------------------
# Determine the operating system
# -----------------------------------------------------------------------------
-IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
- SET(WTF_OS_UNIX 1)
-
+IF (UNIX)
IF (APPLE)
SET(WTF_OS_MAC_OS_X 1)
+ ELSE ()
+ SET(WTF_OS_UNIX 1)
ENDIF ()
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
SET(WTF_OS_WINDOWS 1)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
