Diff
Modified: trunk/CMakeLists.txt (219601 => 219602)
--- trunk/CMakeLists.txt 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/CMakeLists.txt 2017-07-18 05:46:55 UTC (rev 219602)
@@ -119,6 +119,7 @@
set(WebCore_LIBRARY_TYPE STATIC)
endif ()
+set(WTF_LIBRARY_TYPE STATIC)
set(_javascript_Core_LIBRARY_TYPE SHARED)
set(PAL_LIBRARY_TYPE STATIC)
set(WebKit_LIBRARY_TYPE SHARED)
Modified: trunk/ChangeLog (219601 => 219602)
--- trunk/ChangeLog 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/ChangeLog 2017-07-18 05:46:55 UTC (rev 219602)
@@ -1,3 +1,20 @@
+2017-07-17 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Set library types before their targets are created
+ https://bugs.webkit.org/show_bug.cgi?id=174600
+
+ Reviewed by Michael Catanzaro.
+
+ Since r219560 library targets are created before PlatformXXX.cmake
+ files are processed, however library type must be passed in
+ add_library() call and cannot be changed afterwards. Set these
+ variables in OptionsXXX.cmake.
+
+ * CMakeLists.txt:
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+ * Source/cmake/OptionsWin.cmake:
+
2017-07-17 Michael Catanzaro <mcatanz...@igalia.com>
[CMake] Include most CMake modules from WebKitCommon.cmake
Modified: trunk/Source/WTF/ChangeLog (219601 => 219602)
--- trunk/Source/WTF/ChangeLog 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/Source/WTF/ChangeLog 2017-07-18 05:46:55 UTC (rev 219602)
@@ -1,3 +1,18 @@
+2017-07-17 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Set library types before their targets are created
+ https://bugs.webkit.org/show_bug.cgi?id=174600
+
+ Reviewed by Michael Catanzaro.
+
+ Since r219560 library targets are created before PlatformXXX.cmake
+ files are processed, however library type must be passed in
+ add_library() call and cannot be changed afterwards. Set these
+ variables in OptionsXXX.cmake.
+
+ * wtf/PlatformGTK.cmake:
+ * wtf/PlatformMac.cmake:
+
2017-07-17 Yoshiaki Jitsukawa <yoshiaki.jitsuk...@sony.com>
Move USE_AVFOUNDATION definition on Windows to wtf/Platform.h
Modified: trunk/Source/WTF/wtf/PlatformGTK.cmake (219601 => 219602)
--- trunk/Source/WTF/wtf/PlatformGTK.cmake 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/Source/WTF/wtf/PlatformGTK.cmake 2017-07-18 05:46:55 UTC (rev 219602)
@@ -1,4 +1,3 @@
-set(WTF_LIBRARY_TYPE STATIC)
set(WTF_OUTPUT_NAME WTFGTK)
list(APPEND WTF_SOURCES
Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (219601 => 219602)
--- trunk/Source/WTF/wtf/PlatformMac.cmake 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2017-07-18 05:46:55 UTC (rev 219602)
@@ -1,5 +1,3 @@
-set(WTF_LIBRARY_TYPE STATIC)
-
find_library(COCOA_LIBRARY Cocoa)
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
find_library(READLINE_LIBRARY Readline)
Modified: trunk/Source/WebCore/ChangeLog (219601 => 219602)
--- trunk/Source/WebCore/ChangeLog 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/Source/WebCore/ChangeLog 2017-07-18 05:46:55 UTC (rev 219602)
@@ -1,3 +1,19 @@
+2017-07-17 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Set library types before their targets are created
+ https://bugs.webkit.org/show_bug.cgi?id=174600
+
+ Reviewed by Michael Catanzaro.
+
+ Since r219560 library targets are created before PlatformXXX.cmake
+ files are processed, however library type must be passed in
+ add_library() call and cannot be changed afterwards. Set these
+ variables in OptionsXXX.cmake.
+
+ No new tests needed.
+
+ * PlatformMac.cmake:
+
2017-07-17 Yoshiaki Jitsukawa <yoshiaki.jitsuk...@sony.com>
Move USE_AVFOUNDATION definition on Windows to wtf/Platform.h
Modified: trunk/Source/WebCore/PlatformMac.cmake (219601 => 219602)
--- trunk/Source/WebCore/PlatformMac.cmake 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-07-18 05:46:55 UTC (rev 219602)
@@ -1,5 +1,3 @@
-set(WebCore_LIBRARY_TYPE SHARED)
-
if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
@@ -800,7 +798,6 @@
${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
)
-set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE WebCore)
list(APPEND WebCoreTestSupport_SOURCES
bindings/js/JSMockContentFilterSettingsCustom.cpp
Modified: trunk/Source/WebKitLegacy/ChangeLog (219601 => 219602)
--- trunk/Source/WebKitLegacy/ChangeLog 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/Source/WebKitLegacy/ChangeLog 2017-07-18 05:46:55 UTC (rev 219602)
@@ -1,3 +1,18 @@
+2017-07-17 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Set library types before their targets are created
+ https://bugs.webkit.org/show_bug.cgi?id=174600
+
+ Reviewed by Michael Catanzaro.
+
+ Since r219560 library targets are created before PlatformXXX.cmake
+ files are processed, however library type must be passed in
+ add_library() call and cannot be changed afterwards. Set these
+ variables in OptionsXXX.cmake.
+
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+
2017-07-17 Darin Adler <da...@apple.com>
Improve use of NeverDestroyed
Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake (219601 => 219602)
--- trunk/Source/WebKitLegacy/PlatformMac.cmake 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake 2017-07-18 05:46:55 UTC (rev 219602)
@@ -320,8 +320,6 @@
mac/WebView/WebViewData.mm
)
-set(WebKit_LIBRARY_TYPE SHARED)
-
set(WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES
mac/DOM
mac/DefaultDelegates
Modified: trunk/Source/WebKitLegacy/PlatformWin.cmake (219601 => 219602)
--- trunk/Source/WebKitLegacy/PlatformWin.cmake 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/Source/WebKitLegacy/PlatformWin.cmake 2017-07-18 05:46:55 UTC (rev 219602)
@@ -457,8 +457,6 @@
)
endif ()
-set(WebKit_LIBRARY_TYPE SHARED)
-
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
Modified: trunk/Source/cmake/OptionsMac.cmake (219601 => 219602)
--- trunk/Source/cmake/OptionsMac.cmake 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/Source/cmake/OptionsMac.cmake 2017-07-18 05:46:55 UTC (rev 219602)
@@ -113,3 +113,7 @@
set(ENABLE_GRAPHICS_CONTEXT_3D ON)
set(ENABLE_WEBKIT_LEGACY ON)
set(ENABLE_WEBKIT ON)
+
+set(WebCore_LIBRARY_TYPE SHARED)
+set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
+set(WebKit_LIBRARY_TYPE SHARED)
Modified: trunk/Source/cmake/OptionsWPE.cmake (219601 => 219602)
--- trunk/Source/cmake/OptionsWPE.cmake 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/Source/cmake/OptionsWPE.cmake 2017-07-18 05:46:55 UTC (rev 219602)
@@ -52,7 +52,6 @@
set(ENABLE_API_TESTS ${DEVELOPER_MODE})
-set(WTF_LIBRARY_TYPE STATIC)
set(_javascript_Core_LIBRARY_TYPE STATIC)
set(WebCore_LIBRARY_TYPE STATIC)
set(WebKit2_OUTPUT_NAME WPEWebKit)
Modified: trunk/Source/cmake/OptionsWin.cmake (219601 => 219602)
--- trunk/Source/cmake/OptionsWin.cmake 2017-07-18 05:19:16 UTC (rev 219601)
+++ trunk/Source/cmake/OptionsWin.cmake 2017-07-18 05:46:55 UTC (rev 219602)
@@ -135,5 +135,6 @@
set(_javascript_Core_LIBRARY_TYPE SHARED)
set(WTF_LIBRARY_TYPE SHARED)
set(PAL_LIBRARY_TYPE STATIC)
+set(WebKit_LIBRARY_TYPE SHARED)
find_package(ICU REQUIRED)
