Diff
Modified: tags/Safari-604.1.35.1/CMakeLists.txt (220141 => 220142)
--- tags/Safari-604.1.35.1/CMakeLists.txt 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/CMakeLists.txt 2017-08-02 18:10:22 UTC (rev 220142)
@@ -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: tags/Safari-604.1.35.1/ChangeLog (220141 => 220142)
--- tags/Safari-604.1.35.1/ChangeLog 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/ChangeLog 2017-08-02 18:10:22 UTC (rev 220142)
@@ -1,3 +1,24 @@
+2017-08-02 Matthew Hanson <matthew_han...@apple.com>
+
+ Cherry-pick r219602. rdar://problem/33537767
+
+ 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 Konstantin Tokarev <annu...@yandex.ru>
[CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
Modified: tags/Safari-604.1.35.1/Source/WTF/ChangeLog (220141 => 220142)
--- tags/Safari-604.1.35.1/Source/WTF/ChangeLog 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WTF/ChangeLog 2017-08-02 18:10:22 UTC (rev 220142)
@@ -1,3 +1,22 @@
+2017-08-02 Matthew Hanson <matthew_han...@apple.com>
+
+ Cherry-pick r219602. rdar://problem/33537767
+
+ 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 Konstantin Tokarev <annu...@yandex.ru>
[CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
Modified: tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformGTK.cmake (220141 => 220142)
--- tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformGTK.cmake 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformGTK.cmake 2017-08-02 18:10:22 UTC (rev 220142)
@@ -1,4 +1,3 @@
-set(WTF_LIBRARY_TYPE STATIC)
set(WTF_OUTPUT_NAME WTFGTK)
list(APPEND WTF_SOURCES
Modified: tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformMac.cmake (220141 => 220142)
--- tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformMac.cmake 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WTF/wtf/PlatformMac.cmake 2017-08-02 18:10:22 UTC (rev 220142)
@@ -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: tags/Safari-604.1.35.1/Source/WebCore/ChangeLog (220141 => 220142)
--- tags/Safari-604.1.35.1/Source/WebCore/ChangeLog 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WebCore/ChangeLog 2017-08-02 18:10:22 UTC (rev 220142)
@@ -1,3 +1,23 @@
+2017-08-02 Matthew Hanson <matthew_han...@apple.com>
+
+ Cherry-pick r219602. rdar://problem/33537767
+
+ 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-31 Jason Marcell <jmarc...@apple.com>
Cherry-pick r220048. rdar://problem/33619591
Modified: tags/Safari-604.1.35.1/Source/WebCore/PlatformMac.cmake (220141 => 220142)
--- tags/Safari-604.1.35.1/Source/WebCore/PlatformMac.cmake 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WebCore/PlatformMac.cmake 2017-08-02 18:10:22 UTC (rev 220142)
@@ -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: tags/Safari-604.1.35.1/Source/WebKitLegacy/ChangeLog (220141 => 220142)
--- tags/Safari-604.1.35.1/Source/WebKitLegacy/ChangeLog 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WebKitLegacy/ChangeLog 2017-08-02 18:10:22 UTC (rev 220142)
@@ -1,3 +1,22 @@
+2017-08-02 Matthew Hanson <matthew_han...@apple.com>
+
+ Cherry-pick r219602. rdar://problem/33537767
+
+ 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 Konstantin Tokarev <annu...@yandex.ru>
[CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
Modified: tags/Safari-604.1.35.1/Source/WebKitLegacy/PlatformMac.cmake (220141 => 220142)
--- tags/Safari-604.1.35.1/Source/WebKitLegacy/PlatformMac.cmake 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WebKitLegacy/PlatformMac.cmake 2017-08-02 18:10:22 UTC (rev 220142)
@@ -320,8 +320,6 @@
mac/WebView/WebViewData.mm
)
-set(WebKit_LIBRARY_TYPE SHARED)
-
set(WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES
mac/DOM
mac/DefaultDelegates
Modified: tags/Safari-604.1.35.1/Source/WebKitLegacy/PlatformWin.cmake (220141 => 220142)
--- tags/Safari-604.1.35.1/Source/WebKitLegacy/PlatformWin.cmake 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/WebKitLegacy/PlatformWin.cmake 2017-08-02 18:10:22 UTC (rev 220142)
@@ -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: tags/Safari-604.1.35.1/Source/cmake/OptionsMac.cmake (220141 => 220142)
--- tags/Safari-604.1.35.1/Source/cmake/OptionsMac.cmake 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/cmake/OptionsMac.cmake 2017-08-02 18:10:22 UTC (rev 220142)
@@ -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: tags/Safari-604.1.35.1/Source/cmake/OptionsWPE.cmake (220141 => 220142)
--- tags/Safari-604.1.35.1/Source/cmake/OptionsWPE.cmake 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/cmake/OptionsWPE.cmake 2017-08-02 18:10:22 UTC (rev 220142)
@@ -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: tags/Safari-604.1.35.1/Source/cmake/OptionsWin.cmake (220141 => 220142)
--- tags/Safari-604.1.35.1/Source/cmake/OptionsWin.cmake 2017-08-02 18:10:18 UTC (rev 220141)
+++ tags/Safari-604.1.35.1/Source/cmake/OptionsWin.cmake 2017-08-02 18:10:22 UTC (rev 220142)
@@ -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)
