[CMake] Add WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS macro

https://bugs.webkit.org/show_bug.cgi?id=79371

Reviewed by Daniel Bates.

.:

Add a new macro to handle the inclusion of the platform specific *.cmake files.
In the future this macro should get expanded to also handle feature specifc
files, like the UseJSC.cmake in WebCore we already have.

* Source/cmake/WebKitMacros.cmake:

Source/JavaScriptCore:

* CMakeLists.txt:
* shell/CMakeLists.txt:
* wtf/CMakeLists.txt:

Source/WebCore:

* CMakeLists.txt:

Source/WebKit:

* CMakeLists.txt:
* PlatformBlackBerry.cmake: Renamed from Source/WebKit/blackberry/CMakeListsBlackBerry.txt.
* PlatformEfl.cmake: Renamed from Source/WebKit/efl/CMakeListsEfl.txt.
* PlatformWinCE.cmake: Renamed from Source/WebKit/wince/CMakeListsWinCE.txt.

Source/WebKit2:

* CMakeLists.txt:

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

diff --git a/ChangeLog b/ChangeLog
index 62c3155..c3377d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2012-02-23  Patrick Gansterer  <paroga@webkit.org>
 
+        [CMake] Add WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS macro
+        https://bugs.webkit.org/show_bug.cgi?id=79371
+
+        Reviewed by Daniel Bates.
+
+        Add a new macro to handle the inclusion of the platform specific *.cmake files.
+        In the future this macro should get expanded to also handle feature specifc
+        files, like the UseJSC.cmake in WebCore we already have.
+
+        * Source/cmake/WebKitMacros.cmake:
+
+2012-02-23  Patrick Gansterer  <paroga@webkit.org>
+
         [CMake] Add FindDirectX
         https://bugs.webkit.org/show_bug.cgi?id=79344
 

diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index d9d6231..a6ac622 100644 (file)
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -288,7 +288,7 @@ ELSE ()
 ENDIF ()
 
 
-INCLUDE_IF_EXISTS(${JAVASCRIPTCORE_DIR}/Platform${PORT}.cmake)
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 
 ADD_SUBDIRECTORY(wtf)

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 2f9ff37..0f55c1a 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2012-02-23  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Add WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS macro
+        https://bugs.webkit.org/show_bug.cgi?id=79371
+
+        Reviewed by Daniel Bates.
+
+        * CMakeLists.txt:
+        * shell/CMakeLists.txt:
+        * wtf/CMakeLists.txt:
+
 2012-02-23  Aron Rosenberg  <arosenberg@logitech.com>
 
         Fix the PRI macros used in WTF::String formatters to be compatible with Qt and Visual Studio 2005 and newer.

diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
index f7c4d96..b9d64db 100644 (file)
--- a/Source/JavaScriptCore/shell/CMakeLists.txt
+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(JSC_LIBRARIES
     ${JavaScriptCore_LIBRARY_NAME}
 )
 
-INCLUDE_IF_EXISTS(${JAVASCRIPTCORE_DIR}/shell/Platform${PORT}.cmake)
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
 INCLUDE_DIRECTORIES(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})

diff --git a/Source/JavaScriptCore/wtf/CMakeLists.txt b/Source/JavaScriptCore/wtf/CMakeLists.txt
index 4b5be51..63fc59c 100644 (file)
--- a/Source/JavaScriptCore/wtf/CMakeLists.txt
+++ b/Source/JavaScriptCore/wtf/CMakeLists.txt
@@ -201,7 +201,7 @@ ELSE ()
     ADD_DEFINITIONS(-DUSE_SYSTEM_MALLOC=1)
 ENDIF()
 
-INCLUDE_IF_EXISTS(${JAVASCRIPTCORE_DIR}/wtf/Platform${PORT}.cmake)
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
 INCLUDE_DIRECTORIES(${WTF_INCLUDE_DIRECTORIES})

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index b64b834..0aee208 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -2292,7 +2292,7 @@ INCLUDE(${WEBCORE_DIR}/UseJSC.cmake)
 
 SET(WebCore_LIBRARIES ${JavaScriptCore_LIBRARY_NAME})
 SET(WebCore_LINK_FLAGS "")
-INCLUDE_IF_EXISTS(${WEBCORE_DIR}/Platform${PORT}.cmake)
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 # ANGLE tokenizer & parser
 ADD_CUSTOM_COMMAND(

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 707974f..21fd2a8 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-23  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Add WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS macro
+        https://bugs.webkit.org/show_bug.cgi?id=79371
+
+        Reviewed by Daniel Bates.
+
+        * CMakeLists.txt:
+
 2012-02-23  Julien Chaffraix  <jchaffraix@webkit.org>
 
         Cleanup RenderBlock::moveChildrenTo

diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index c7e5c8c..8bf565e 100644 (file)
--- a/Source/WebKit/CMakeLists.txt
+++ b/Source/WebKit/CMakeLists.txt
@@ -67,7 +67,7 @@ SET(WebKit_LIBRARIES
     ${WebCore_LIBRARY_NAME}
 )
 
-INCLUDE_IF_EXISTS(${WEBKIT_DIR}/${WEBKIT_PORT_DIR}/CMakeLists${PORT}.txt)
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 ADD_DEFINITIONS(-DBUILDING_WebKit)
 INCLUDE_DIRECTORIES(${WebKit_INCLUDE_DIRECTORIES})

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index feb9658..c95efcf 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2012-02-23  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Add WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS macro
+        https://bugs.webkit.org/show_bug.cgi?id=79371
+
+        Reviewed by Daniel Bates.
+
+        * CMakeLists.txt:
+        * PlatformBlackBerry.cmake: Renamed from Source/WebKit/blackberry/CMakeListsBlackBerry.txt.
+        * PlatformEfl.cmake: Renamed from Source/WebKit/efl/CMakeListsEfl.txt.
+        * PlatformWinCE.cmake: Renamed from Source/WebKit/wince/CMakeListsWinCE.txt.
+
 2012-02-20  Filip Pizlo  <fpizlo@apple.com>
 
         JSC should be a triple-tier VM

diff --git a/Source/WebKit/blackberry/CMakeListsBlackBerry.txt b/Source/WebKit/PlatformBlackBerry.cmake
similarity index 100%
rename from Source/WebKit/blackberry/CMakeListsBlackBerry.txt
rename to Source/WebKit/PlatformBlackBerry.cmake

diff --git a/Source/WebKit/efl/CMakeListsEfl.txt b/Source/WebKit/PlatformEfl.cmake
similarity index 100%
rename from Source/WebKit/efl/CMakeListsEfl.txt
rename to Source/WebKit/PlatformEfl.cmake

diff --git a/Source/WebKit/wince/CMakeListsWinCE.txt b/Source/WebKit/PlatformWinCE.cmake
similarity index 100%
rename from Source/WebKit/wince/CMakeListsWinCE.txt
rename to Source/WebKit/PlatformWinCE.cmake

diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
index 42cc83f..0dc836c 100644 (file)
--- a/Source/WebKit2/CMakeLists.txt
+++ b/Source/WebKit2/CMakeLists.txt
@@ -506,7 +506,7 @@ SET(WebProcess_LIBRARIES
 
 SET(ForwardingHeaders_NAME )
 SET(ForwardingNetworkHeaders_NAME )
-INCLUDE_IF_EXISTS(${WEBKIT2_DIR}/Platform${PORT}.cmake)
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 ADD_DEFINITIONS(-DBUILDING_WEBKIT)
 INCLUDE_DIRECTORIES(${WebKit2_INCLUDE_DIRECTORIES})

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 118d50a..cfb7a17 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-23  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Add WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS macro
+        https://bugs.webkit.org/show_bug.cgi?id=79371
+
+        Reviewed by Daniel Bates.
+
+        * CMakeLists.txt:
+
 2012-02-23  Simon Hausmann  <simon.hausmann@nokia.com>
 
         [Qt] Add support for touch cancellation

diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
index e43a4a4..3abe342 100644 (file)
--- a/Source/cmake/WebKitMacros.cmake
+++ b/Source/cmake/WebKitMacros.cmake
@@ -141,6 +141,10 @@ MACRO(MAKE_HASH_TOOLS _source)
     UNSET(_hash_tools_h)
 ENDMACRO()
 
+MACRO (WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS)
+    INCLUDE_IF_EXISTS(${CMAKE_CURRENT_SOURCE_DIR}/Platform${PORT}.cmake)
+ENDMACRO ()
+
 MACRO (WEBKIT_WRAP_SOURCELIST)
     FOREACH (_file ${ARGN})
         GET_FILENAME_COMPONENT(_basename ${_file} NAME_WE)