Diff
Modified: trunk/ChangeLog (219559 => 219560)
--- trunk/ChangeLog 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/ChangeLog 2017-07-17 15:16:54 UTC (rev 219560)
@@ -1,3 +1,12 @@
+2017-07-17 Konstantin Tokarev <annu...@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 <mcatanz...@igalia.com>
[CMake] Raise minimum CMake requirement
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (219559 => 219560)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2017-07-17 15:16:54 UTC (rev 219560)
@@ -1523,7 +1523,7 @@
message(FATAL_ERROR "Unknown CPU")
endif ()
-
+WEBKIT_FRAMEWORK_DECLARE(_javascript_Core)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
WEBKIT_CREATE_FORWARDING_HEADERS(_javascript_Core DIRECTORIES ${_javascript_Core_FORWARDING_HEADERS_DIRECTORIES} FILES ${_javascript_Core_FORWARDING_HEADERS_FILES})
Modified: trunk/Source/_javascript_Core/ChangeLog (219559 => 219560)
--- trunk/Source/_javascript_Core/ChangeLog 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-07-17 15:16:54 UTC (rev 219560)
@@ -1,3 +1,12 @@
+2017-07-17 Konstantin Tokarev <annu...@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....@gmail.com>
[WTF] Use std::unique_ptr for StackTrace
Modified: trunk/Source/WTF/ChangeLog (219559 => 219560)
--- trunk/Source/WTF/ChangeLog 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/WTF/ChangeLog 2017-07-17 15:16:54 UTC (rev 219560)
@@ -1,3 +1,12 @@
+2017-07-17 Konstantin Tokarev <annu...@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 <jbed...@apple.com>
Add iOS 11 SPI
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (219559 => 219560)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2017-07-17 15:16:54 UTC (rev 219560)
@@ -357,6 +357,7 @@
)
endif ()
+WEBKIT_FRAMEWORK_DECLARE(WTF)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
Modified: trunk/Source/WebCore/CMakeLists.txt (219559 => 219560)
--- trunk/Source/WebCore/CMakeLists.txt 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-07-17 15:16:54 UTC (rev 219560)
@@ -3587,6 +3587,7 @@
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
Modified: trunk/Source/WebCore/ChangeLog (219559 => 219560)
--- trunk/Source/WebCore/ChangeLog 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/WebCore/ChangeLog 2017-07-17 15:16:54 UTC (rev 219560)
@@ -1,3 +1,14 @@
+2017-07-17 Konstantin Tokarev <annu...@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 <mcatanz...@igalia.com>
Unreviewed, rolling out r219556.
Modified: trunk/Source/WebCore/PAL/ChangeLog (219559 => 219560)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-07-17 15:16:54 UTC (rev 219560)
@@ -1,3 +1,14 @@
+2017-07-17 Konstantin Tokarev <annu...@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 <pvol...@apple.com>
[Win] Build error when building WebCore from WebCore.proj project file.
Modified: trunk/Source/WebCore/PAL/pal/CMakeLists.txt (219559 => 219560)
--- trunk/Source/WebCore/PAL/pal/CMakeLists.txt 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/WebCore/PAL/pal/CMakeLists.txt 2017-07-17 15:16:54 UTC (rev 219560)
@@ -16,6 +16,7 @@
WTF
)
+WEBKIT_FRAMEWORK_DECLARE(PAL)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
WEBKIT_WRAP_SOURCELIST(${PAL_SOURCES})
Modified: trunk/Source/WebKit/CMakeLists.txt (219559 => 219560)
--- trunk/Source/WebKit/CMakeLists.txt 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/WebKit/CMakeLists.txt 2017-07-17 15:16:54 UTC (rev 219560)
@@ -759,6 +759,7 @@
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
Modified: trunk/Source/WebKit/ChangeLog (219559 => 219560)
--- trunk/Source/WebKit/ChangeLog 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/WebKit/ChangeLog 2017-07-17 15:16:54 UTC (rev 219560)
@@ -1,3 +1,12 @@
+2017-07-17 Konstantin Tokarev <annu...@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 <cgar...@igalia.com>
Web Automation: link and partial link queries don't work if the link contains formatting tags
Modified: trunk/Source/WebKitLegacy/CMakeLists.txt (219559 => 219560)
--- trunk/Source/WebKitLegacy/CMakeLists.txt 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/WebKitLegacy/CMakeLists.txt 2017-07-17 15:16:54 UTC (rev 219560)
@@ -35,6 +35,7 @@
PRIVATE PAL${DEBUG_SUFFIX}
)
+WEBKIT_FRAMEWORK_DECLARE(WebKit)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
if (MSVC)
Modified: trunk/Source/WebKitLegacy/ChangeLog (219559 => 219560)
--- trunk/Source/WebKitLegacy/ChangeLog 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/WebKitLegacy/ChangeLog 2017-07-17 15:16:54 UTC (rev 219560)
@@ -1,3 +1,12 @@
+2017-07-17 Konstantin Tokarev <annu...@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 <jbed...@apple.com>
Add iOS 11 SPI
Modified: trunk/Source/cmake/WebKitMacros.cmake (219559 => 219560)
--- trunk/Source/cmake/WebKitMacros.cmake 2017-07-17 14:56:40 UTC (rev 219559)
+++ trunk/Source/cmake/WebKitMacros.cmake 2017-07-17 15:16:54 UTC (rev 219560)
@@ -75,9 +75,15 @@
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}
)
