[CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
authorannulen@yandex.ru <annulen@yandex.ru@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jul 2017 15:16:54 +0000 (15:16 +0000)
committerannulen@yandex.ru <annulen@yandex.ru@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jul 2017 15:16:54 +0000 (15:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=174557

Reviewed by Michael Catanzaro.

.:

* Source/cmake/WebKitMacros.cmake:

Source/JavaScriptCore:

* CMakeLists.txt:

Source/WebCore:

No new tests needed.

* CMakeLists.txt:

Source/WebCore/PAL:

No new tests needed.

* pal/CMakeLists.txt:

Source/WebKit:

* CMakeLists.txt:

Source/WebKitLegacy:

* CMakeLists.txt:

Source/WTF:

* wtf/CMakeLists.txt:

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

14 files changed:
ChangeLog
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/CMakeLists.txt
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/CMakeLists.txt
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKitLegacy/CMakeLists.txt
Source/WebKitLegacy/ChangeLog
Source/cmake/WebKitMacros.cmake

index 528c8ba406a0751b8d650189b1ec002d5bc5c4f2..086ad708bb50eade157fa48de7b14b9d5fb2b2fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-07-17  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
+        https://bugs.webkit.org/show_bug.cgi?id=174557
+
+        Reviewed by Michael Catanzaro.
+
+        * Source/cmake/WebKitMacros.cmake:
+
 2017-07-16  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [CMake] Raise minimum CMake requirement
index 937d9892596e7e641b93176374d48fa4e00a562a..b4b205e00a1dd13648b929f9bc6bcf7dc08a98df 100644 (file)
@@ -1523,7 +1523,7 @@ else ()
     message(FATAL_ERROR "Unknown CPU")
 endif ()
 
-
+WEBKIT_FRAMEWORK_DECLARE(JavaScriptCore)
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 WEBKIT_CREATE_FORWARDING_HEADERS(JavaScriptCore DIRECTORIES ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${JavaScriptCore_FORWARDING_HEADERS_FILES})
index de20c35519bb6d548ab68551d2ddfae6fbe0c0bb..a3d8c7dc8bbbc2e2cd3d6273fad83a9388404261 100644 (file)
@@ -1,3 +1,12 @@
+2017-07-17  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
+        https://bugs.webkit.org/show_bug.cgi?id=174557
+
+        Reviewed by Michael Catanzaro.
+
+        * CMakeLists.txt:
+
 2017-07-14  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [WTF] Use std::unique_ptr for StackTrace
index 0180818c0fcbc8825168d2b97a9bd44dc1fa4efe..27d1cb55b02cbacf921d5ab42307efd89e9583a2 100644 (file)
@@ -1,3 +1,12 @@
+2017-07-17  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
+        https://bugs.webkit.org/show_bug.cgi?id=174557
+
+        Reviewed by Michael Catanzaro.
+
+        * wtf/CMakeLists.txt:
+
 2017-07-14  Jonathan Bedard  <jbedard@apple.com>
 
         Add iOS 11 SPI
index 936afb59801d8527b8d009bb7bb520b8fc433c8d..da6752dab4f33fc454d301f132b9f309a4b12d0c 100644 (file)
@@ -357,6 +357,7 @@ else ()
     )
 endif ()
 
+WEBKIT_FRAMEWORK_DECLARE(WTF)
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
index 4a165054452867d0255173ad270483a14643c19f..e3c92f5b8535d1913c7eb586af770a3c387dd5f1 100644 (file)
@@ -3587,6 +3587,7 @@ set(WINDOW_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowConstructor
 set(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/WorkerGlobalScopeConstructors.idl)
 set(DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/DedicatedWorkerGlobalScopeConstructors.idl)
 
+WEBKIT_FRAMEWORK_DECLARE(WebCore)
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 # Generate InspectorOverlayPage.h
index 1266534b9942867a53cc24a526db569033d1bf89..ac41cb0cfcd7acc853faa13db4a53dafe3754e33 100644 (file)
@@ -1,3 +1,14 @@
+2017-07-17  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
+        https://bugs.webkit.org/show_bug.cgi?id=174557
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests needed.
+
+        * CMakeLists.txt:
+
 2017-07-17  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Unreviewed, rolling out r219556.
index f04694887010bebff7f251fe8161aefcd5118e11..998af1a2d1a52774b98dc4a2d771dbaf2f948f6c 100644 (file)
@@ -1,3 +1,14 @@
+2017-07-17  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
+        https://bugs.webkit.org/show_bug.cgi?id=174557
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests needed.
+
+        * pal/CMakeLists.txt:
+
 2017-07-13  Per Arne Vollan  <pvollan@apple.com>
 
         [Win] Build error when building WebCore from WebCore.proj project file.
index 420438d0d482dba8c4a6825accd0ec6311f62424..556a508c6db923a7e3c9284d614beeb3a365d83a 100644 (file)
@@ -16,6 +16,7 @@ set(PAL_LIBRARIES
     WTF
 )
 
+WEBKIT_FRAMEWORK_DECLARE(PAL)
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 WEBKIT_WRAP_SOURCELIST(${PAL_SOURCES})
index fb19fe45125c9226317a4748719f598b22339c39..8ba00c473216dc8a8384a93a2313044da9bc4e00 100644 (file)
@@ -759,6 +759,7 @@ endmacro()
 set(WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
 )
 
+WEBKIT_FRAMEWORK_DECLARE(WebKit2)
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 # Helper macro which wraps generate-message-receiver.py and generate-message-header.py scripts
index e996073e0a5c34ed19d0dfe4f4434c02b980054d..e3d2c01aaecbb7834e2817d0be65efa2e854a663 100644 (file)
@@ -1,3 +1,12 @@
+2017-07-17  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
+        https://bugs.webkit.org/show_bug.cgi?id=174557
+
+        Reviewed by Michael Catanzaro.
+
+        * CMakeLists.txt:
+
 2017-07-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Web Automation: link and partial link queries don't work if the link contains formatting tags
index 04c164177c5fc8f884b468f54a37627d61d3dbb3..dedef7dea87bac0ddab035b49bdce8b166356024 100644 (file)
@@ -35,6 +35,7 @@ set(WebKit_LIBRARIES
     PRIVATE PAL${DEBUG_SUFFIX}
 )
 
+WEBKIT_FRAMEWORK_DECLARE(WebKit)
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 if (MSVC)
index 3f4fffffb36a0a1519a6a067c8c23b861c037ba1..23dc65137f409832f5e6c54fff4f4fff2cbe02aa 100644 (file)
@@ -1,3 +1,12 @@
+2017-07-17  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
+        https://bugs.webkit.org/show_bug.cgi?id=174557
+
+        Reviewed by Michael Catanzaro.
+
+        * CMakeLists.txt:
+
 2017-07-14  Jonathan Bedard  <jbedard@apple.com>
 
         Add iOS 11 SPI
index 6493755992d10be314fe4012dca1092ad4c60d96..9d5443f27e7464e146661e811e87b72d45ff1070 100644 (file)
@@ -75,9 +75,15 @@ macro(WEBKIT_WRAP_SOURCELIST)
     source_group("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_WEBCORE_DIR}")
 endmacro()
 
+macro(WEBKIT_FRAMEWORK_DECLARE _target)
+    # add_library() without any source files triggers CMake warning
+    # Addition of dummy "source" file does not result in any changes in generated build.ninja file
+    add_library(${_target} ${${_target}_LIBRARY_TYPE} "${CMAKE_BINARY_DIR}/cmakeconfig.h")
+endmacro()
+
 macro(WEBKIT_FRAMEWORK _target)
     include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
-    add_library(${_target} ${${_target}_LIBRARY_TYPE}
+    target_sources(${_target} PRIVATE
         ${${_target}_HEADERS}
         ${${_target}_SOURCES}
     )