2010-12-04 Patrick Gansterer <paroga@webkit.org>
authorparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 4 Dec 2010 15:19:54 +0000 (15:19 +0000)
committerparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 4 Dec 2010 15:19:54 +0000 (15:19 +0000)
        Reviewed by Andreas Kling.

        [CMake] Better detection of ARM platform
        https://bugs.webkit.org/show_bug.cgi?id=50452

        * CMakeLists.txt:

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

CMakeLists.txt
ChangeLog

index 6df2017..159d99c 100644 (file)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(WebKit)
-
-# 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")
-
-SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")
-SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
-SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
-SET(WEBKITTOOLS_DIR "${CMAKE_SOURCE_DIR}/WebKitTools")
-SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
-
-INCLUDE(WebKitMacros)
-INCLUDE(WebKitGenerators)
-INCLUDE(WebKitHelpers)
-INCLUDE(WebKitFeatures)
-
-# -----------------------------------------------------------------------------
-# Determine which port will be built
-# -----------------------------------------------------------------------------
-SET(ALL_PORTS Efl)
-OPTION(PORT "choose which WebKit port to build (one of ${ALL_PORTS})" "NOPORT")
-
-# -----------------------------------------------------------------------------
-# Find common packages (used by all ports)
-# -----------------------------------------------------------------------------
-FIND_PACKAGE(BISON REQUIRED)
-FIND_PACKAGE(FLEX REQUIRED)
-FIND_PACKAGE(Gperf REQUIRED)
-FIND_PACKAGE(Perl REQUIRED)
-FIND_PACKAGE(PythonInterp REQUIRED)
-
-# -----------------------------------------------------------------------------
-# Determine the target processor
-# -----------------------------------------------------------------------------
-IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
-    SET(WTF_CPU_ARM 1)
-ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)")
-    SET(WTF_CPU_X86_64 1)
-ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
-    SET(WTF_CPU_X86 1)
-ELSE ()
-    MESSAGE(FATAL_ERROR "Unknown CPU '${CMAKE_SYSTEM_PROCESSOR}'")
-ENDIF ()
-
-# -----------------------------------------------------------------------------
-# Determine the operating system
-# -----------------------------------------------------------------------------
-IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    SET(WTF_OS_UNIX 1)
-
-    IF (APPLE)
-        SET(WTF_OS_MAC_OS_X 1)
-    ENDIF ()
-ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
-    SET(WTF_OS_WINDOWS 1)
-ELSE ()
-    MESSAGE(FATAL_ERROR "Unknown OS '${CMAKE_SYSTEM_NAME}'")
-ENDIF ()
-
-# -----------------------------------------------------------------------------
-# Default target names (can be overrriden in Options${PORT}.cmake file)
-# -----------------------------------------------------------------------------
-SET(JSC_EXECUTABLE_NAME JSC)
-SET(WTF_LIBRARY_NAME WTF)
-SET(JavaScriptCore_LIBRARY_NAME JavaScriptCore)
-SET(WebCore_LIBRARY_NAME WebCore)
-SET(WebKit_LIBRARY_NAME WebKit)
-
-# -----------------------------------------------------------------------------
-# Default library types
-# -----------------------------------------------------------------------------
-OPTION(SHARED_CORE "build WTF, JavaScriptCore and WebCore as shared libraries")
-
-IF (SHARED_CORE)
-    SET(WTF_LIBRARY_TYPE SHARED)
-    SET(JavaScriptCore_LIBRARY_TYPE SHARED)
-    SET(WebCore_LIBRARY_TYPE SHARED)
-ELSE ()
-    SET(WTF_LIBRARY_TYPE STATIC)
-    SET(JavaScriptCore_LIBRARY_TYPE STATIC)
-    SET(WebCore_LIBRARY_TYPE STATIC)
-ENDIF ()
-
-SET(WebKit_LIBRARY_TYPE SHARED)
-
-# -----------------------------------------------------------------------------
-# Port-specific options
-# -----------------------------------------------------------------------------
-INCLUDE(OptionsCommon)
-INCLUDE(Options${PORT})
-
-# -----------------------------------------------------------------------------
-# Define packaging
-# -----------------------------------------------------------------------------
-INCLUDE(WebKitPackaging)
-
-# -----------------------------------------------------------------------------
-# Add module directories
-# -----------------------------------------------------------------------------
-ADD_SUBDIRECTORY(JavaScriptCore)
-ADD_SUBDIRECTORY(WebCore)
-ADD_SUBDIRECTORY(WebKit)
-
-# -----------------------------------------------------------------------------
-# Add test browser if exists
-# -----------------------------------------------------------------------------
-INCLUDE_IF_EXISTS(${WEBKITTOOLS_DIR}/CMakeLists${PORT}.txt)
-
-# -----------------------------------------------------------------------------
-# Set compiler flags for all targets
-# -----------------------------------------------------------------------------
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WTF_LIBRARY_NAME})
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(${JavaScriptCore_LIBRARY_NAME})
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCore_LIBRARY_NAME})
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebKit_LIBRARY_NAME})
-
-# -----------------------------------------------------------------------------
-# Create the configuration file
-# -----------------------------------------------------------------------------
-CONFIGURE_FILE(cmakeconfig.h.cmake ${CMAKE_BINARY_DIR}/cmakeconfig.h @ONLY)
-
-# -----------------------------------------------------------------------------
-# Prints a summary of all enabled/disabled features
-# -----------------------------------------------------------------------------
-WEBKIT_PRINT_FEATURES()
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)\r
+PROJECT(WebKit)\r
+\r
+# Set a default build type if and only if user did not define one as command\r
+# line options and he did not give custom CFLAGS or CXXFLAGS. Otherwise, flags\r
+# from default build type would overwrite user-defined ones.\r
+IF (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS AND NOT CMAKE_CXX_FLAGS)\r
+    SET(CMAKE_BUILD_TYPE Release)\r
+ENDIF ()\r
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")\r
+\r
+SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")\r
+SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")\r
+SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")\r
+SET(WEBKITTOOLS_DIR "${CMAKE_SOURCE_DIR}/WebKitTools")\r
+SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")\r
+\r
+INCLUDE(WebKitMacros)\r
+INCLUDE(WebKitGenerators)\r
+INCLUDE(WebKitHelpers)\r
+INCLUDE(WebKitFeatures)\r
+\r
+# -----------------------------------------------------------------------------\r
+# Determine which port will be built\r
+# -----------------------------------------------------------------------------\r
+SET(ALL_PORTS Efl)\r
+OPTION(PORT "choose which WebKit port to build (one of ${ALL_PORTS})" "NOPORT")\r
+\r
+# -----------------------------------------------------------------------------\r
+# Find common packages (used by all ports)\r
+# -----------------------------------------------------------------------------\r
+FIND_PACKAGE(BISON REQUIRED)\r
+FIND_PACKAGE(FLEX REQUIRED)\r
+FIND_PACKAGE(Gperf REQUIRED)\r
+FIND_PACKAGE(Perl REQUIRED)\r
+FIND_PACKAGE(PythonInterp REQUIRED)\r
+\r
+# -----------------------------------------------------------------------------\r
+# Determine the target processor\r
+# -----------------------------------------------------------------------------\r
+STRING(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)\r
+IF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")\r
+    SET(WTF_CPU_ARM 1)\r
+ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)")\r
+    SET(WTF_CPU_X86_64 1)\r
+ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")\r
+    SET(WTF_CPU_X86 1)\r
+ELSE ()\r
+    MESSAGE(FATAL_ERROR "Unknown CPU '${CMAKE_SYSTEM_PROCESSOR}'")\r
+ENDIF ()\r
+\r
+# -----------------------------------------------------------------------------\r
+# Determine the operating system\r
+# -----------------------------------------------------------------------------\r
+IF (CMAKE_SYSTEM_NAME MATCHES "Linux")\r
+    SET(WTF_OS_UNIX 1)\r
+\r
+    IF (APPLE)\r
+        SET(WTF_OS_MAC_OS_X 1)\r
+    ENDIF ()\r
+ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")\r
+    SET(WTF_OS_WINDOWS 1)\r
+ELSE ()\r
+    MESSAGE(FATAL_ERROR "Unknown OS '${CMAKE_SYSTEM_NAME}'")\r
+ENDIF ()\r
+\r
+# -----------------------------------------------------------------------------\r
+# Default target names (can be overrriden in Options${PORT}.cmake file)\r
+# -----------------------------------------------------------------------------\r
+SET(JSC_EXECUTABLE_NAME JSC)\r
+SET(WTF_LIBRARY_NAME WTF)\r
+SET(JavaScriptCore_LIBRARY_NAME JavaScriptCore)\r
+SET(WebCore_LIBRARY_NAME WebCore)\r
+SET(WebKit_LIBRARY_NAME WebKit)\r
+\r
+# -----------------------------------------------------------------------------\r
+# Default library types\r
+# -----------------------------------------------------------------------------\r
+OPTION(SHARED_CORE "build WTF, JavaScriptCore and WebCore as shared libraries")\r
+\r
+IF (SHARED_CORE)\r
+    SET(WTF_LIBRARY_TYPE SHARED)\r
+    SET(JavaScriptCore_LIBRARY_TYPE SHARED)\r
+    SET(WebCore_LIBRARY_TYPE SHARED)\r
+ELSE ()\r
+    SET(WTF_LIBRARY_TYPE STATIC)\r
+    SET(JavaScriptCore_LIBRARY_TYPE STATIC)\r
+    SET(WebCore_LIBRARY_TYPE STATIC)\r
+ENDIF ()\r
+\r
+SET(WebKit_LIBRARY_TYPE SHARED)\r
+\r
+# -----------------------------------------------------------------------------\r
+# Port-specific options\r
+# -----------------------------------------------------------------------------\r
+INCLUDE(OptionsCommon)\r
+INCLUDE(Options${PORT})\r
+\r
+# -----------------------------------------------------------------------------\r
+# Define packaging\r
+# -----------------------------------------------------------------------------\r
+INCLUDE(WebKitPackaging)\r
+\r
+# -----------------------------------------------------------------------------\r
+# Add module directories\r
+# -----------------------------------------------------------------------------\r
+ADD_SUBDIRECTORY(JavaScriptCore)\r
+ADD_SUBDIRECTORY(WebCore)\r
+ADD_SUBDIRECTORY(WebKit)\r
+\r
+# -----------------------------------------------------------------------------\r
+# Add test browser if exists\r
+# -----------------------------------------------------------------------------\r
+INCLUDE_IF_EXISTS(${WEBKITTOOLS_DIR}/CMakeLists${PORT}.txt)\r
+\r
+# -----------------------------------------------------------------------------\r
+# Set compiler flags for all targets\r
+# -----------------------------------------------------------------------------\r
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WTF_LIBRARY_NAME})\r
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(${JavaScriptCore_LIBRARY_NAME})\r
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCore_LIBRARY_NAME})\r
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebKit_LIBRARY_NAME})\r
+\r
+# -----------------------------------------------------------------------------\r
+# Create the configuration file\r
+# -----------------------------------------------------------------------------\r
+CONFIGURE_FILE(cmakeconfig.h.cmake ${CMAKE_BINARY_DIR}/cmakeconfig.h @ONLY)\r
+\r
+# -----------------------------------------------------------------------------\r
+# Prints a summary of all enabled/disabled features\r
+# -----------------------------------------------------------------------------\r
+WEBKIT_PRINT_FEATURES()\r
index 31926a0..62c918d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-04  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [CMake] Better detection of ARM platform
+        https://bugs.webkit.org/show_bug.cgi?id=50452
+
+        * CMakeLists.txt:
+
 2010-12-03  Xan Lopez  <xlopez@igalia.com>
 
         Unreviewed build fix for GTK+.