Diff
Modified: trunk/ChangeLog (196946 => 196947)
--- trunk/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
@@ -1,3 +1,12 @@
+2016-02-22 Konstantin Tokarev <[email protected]>
+
+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/WebKitMacros.cmake:
+
2016-02-18 Philippe Normand <[email protected]>
[GStreamer] Bump internal jhbuild versions to 1.6.3
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (196946 => 196947)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2016-02-22 19:32:47 UTC (rev 196947)
@@ -1310,12 +1310,7 @@
add_subdirectory(shell)
WEBKIT_WRAP_SOURCELIST(${_javascript_Core_SOURCES})
-include_directories(${_javascript_Core_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${_javascript_Core_SYSTEM_INCLUDE_DIRECTORIES})
-add_library(_javascript_Core ${_javascript_Core_LIBRARY_TYPE} ${_javascript_Core_HEADERS} ${_javascript_Core_SOURCES})
-target_link_libraries(_javascript_Core ${_javascript_Core_LIBRARIES})
-set_target_properties(_javascript_Core PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
-set_target_properties(_javascript_Core PROPERTIES FOLDER "_javascript_Core")
+WEBKIT_FRAMEWORK(_javascript_Core)
if (_javascript_Core_PRE_BUILD_COMMAND)
add_custom_command(TARGET _javascript_Core PRE_BUILD COMMAND ${_javascript_Core_PRE_BUILD_COMMAND} VERBATIM)
@@ -1325,10 +1320,6 @@
add_custom_command(TARGET _javascript_Core POST_BUILD COMMAND ${_javascript_Core_POST_BUILD_COMMAND} VERBATIM)
endif ()
-if (_javascript_Core_OUTPUT_NAME)
- set_target_properties(_javascript_Core PROPERTIES OUTPUT_NAME ${_javascript_Core_OUTPUT_NAME})
-endif ()
-
if (${_javascript_Core_LIBRARY_TYPE} STREQUAL "SHARED")
POPULATE_LIBRARY_VERSION(_javascript_CORE)
set_target_properties(_javascript_Core PROPERTIES VERSION ${_javascript_CORE_VERSION} SOVERSION ${_javascript_CORE_VERSION_MAJOR})
@@ -1339,5 +1330,3 @@
add_custom_target(stageSharedScripts DEPENDS ${_javascript_Core_SCRIPTS})
add_dependencies(_javascript_Core stageSharedScripts)
-
-WEBKIT_FRAMEWORK(_javascript_Core)
Modified: trunk/Source/_javascript_Core/ChangeLog (196946 => 196947)
--- trunk/Source/_javascript_Core/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
@@ -1,3 +1,12 @@
+2016-02-22 Konstantin Tokarev <[email protected]>
+
+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+
2016-02-22 Commit Queue <[email protected]>
Unreviewed, rolling out r196891.
Modified: trunk/Source/WTF/ChangeLog (196946 => 196947)
--- trunk/Source/WTF/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WTF/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
@@ -1,3 +1,12 @@
+2016-02-22 Konstantin Tokarev <[email protected]>
+
+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ * wtf/CMakeLists.txt:
+
2016-02-20 Mark Lam <[email protected]>
Use of inlined asm statements causes problems for -std=c99 builds.
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (196946 => 196947)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2016-02-22 19:32:47 UTC (rev 196947)
@@ -284,12 +284,7 @@
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
-include_directories(${WTF_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${WTF_SYSTEM_INCLUDE_DIRECTORIES})
-add_library(WTF ${WTF_LIBRARY_TYPE} ${WTF_HEADERS} ${WTF_SOURCES})
-target_link_libraries(WTF ${WTF_LIBRARIES})
-set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF")
-set_target_properties(WTF PROPERTIES FOLDER "_javascript_Core")
+WEBKIT_FRAMEWORK(WTF)
if (MSVC)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
@@ -299,9 +294,3 @@
if (WTF_PRE_BUILD_COMMAND)
add_custom_command(TARGET WTF PRE_BUILD COMMAND ${WTF_PRE_BUILD_COMMAND} VERBATIM)
endif ()
-
-if (WTF_OUTPUT_NAME)
- set_target_properties(WTF PROPERTIES OUTPUT_NAME ${WTF_OUTPUT_NAME})
-endif ()
-
-WEBKIT_FRAMEWORK(WTF)
Modified: trunk/Source/WebCore/CMakeLists.txt (196946 => 196947)
--- trunk/Source/WebCore/CMakeLists.txt 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-02-22 19:32:47 UTC (rev 196947)
@@ -3771,16 +3771,11 @@
WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
-include_directories(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
-
if (MSVC)
ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
endif ()
-add_library(WebCore ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
-set_target_properties(WebCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_WebCore")
-set_target_properties(WebCore PROPERTIES FOLDER "WebCore")
+WEBKIT_FRAMEWORK(WebCore)
# The -ftree-sra optimization (implicit with -O2) causes crashes when
# allocating large chunks of memory using bmalloc on Intel 32bit.
@@ -3799,14 +3794,11 @@
add_custom_command(TARGET WebCore POST_BUILD COMMAND ${WebCore_POST_BUILD_COMMAND} VERBATIM)
endif ()
-if (WebCore_OUTPUT_NAME)
- set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
-endif ()
-
if (MSVC)
ADD_PRECOMPILED_HEADER("WebCoreTestSupportPrefix.h" "testing/js/WebCoreTestSupportPrefix.cpp" WebCoreTestSupport_SOURCES)
endif ()
+include_directories(${WebCoreTestSupport_INCLUDE_DIRECTORIES})
add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
add_dependencies(WebCoreTestSupport WebCore)
target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
@@ -3848,5 +3840,3 @@
if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND WTF_CPU_ARM AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.9") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.3"))
set_source_files_properties(svg/SVGPathElement.cpp PROPERTIES COMPILE_FLAGS "-O2")
endif ()
-
-WEBKIT_FRAMEWORK(WebCore)
Modified: trunk/Source/WebCore/ChangeLog (196946 => 196947)
--- trunk/Source/WebCore/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebCore/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
@@ -1,5 +1,16 @@
2016-02-22 Konstantin Tokarev <[email protected]>
+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ No new tests needed.
+
+ * CMakeLists.txt:
+
+2016-02-22 Konstantin Tokarev <[email protected]>
+
Workaround for ICE in GCC 4.8 appeared in r196846.
https://bugs.webkit.org/show_bug.cgi?id=154535
Modified: trunk/Source/WebKit/CMakeLists.txt (196946 => 196947)
--- trunk/Source/WebKit/CMakeLists.txt 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebKit/CMakeLists.txt 2016-02-22 19:32:47 UTC (rev 196947)
@@ -27,25 +27,15 @@
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-include_directories(${WebKit_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
-
if (MSVC)
ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES)
list(APPEND WebKit_SOURCES win/WebKit.resources/WebKit.rc)
add_definitions(/DWEBKIT_EXPORTS /DFRAMEWORK_NAME=WebKit)
endif ()
-add_library(WebKit ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
+WEBKIT_FRAMEWORK(WebKit)
+
add_dependencies(WebKit WebCore)
if (WIN32)
add_dependencies(WebKit WebKitGUID)
endif ()
-target_link_libraries(WebKit ${WebKit_LIBRARIES})
-set_target_properties(WebKit PROPERTIES FOLDER "WebKit")
-
-if (WebKit_OUTPUT_NAME)
- set_target_properties(WebKit PROPERTIES OUTPUT_NAME ${WebKit_OUTPUT_NAME})
-endif ()
-
-WEBKIT_FRAMEWORK(WebKit)
Modified: trunk/Source/WebKit/ChangeLog (196946 => 196947)
--- trunk/Source/WebKit/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebKit/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
@@ -1,3 +1,12 @@
+2016-02-22 Konstantin Tokarev <[email protected]>
+
+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+
2016-02-15 Alex Christensen <[email protected]>
Fix internal Windows build of projects built after WebKit
Modified: trunk/Source/WebKit2/CMakeLists.txt (196946 => 196947)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-02-22 19:32:47 UTC (rev 196947)
@@ -770,14 +770,9 @@
GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
-include_directories(${WebKit2_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES})
-add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES} ${WebKit2_DERIVED_SOURCES})
-
+WEBKIT_FRAMEWORK(WebKit2)
add_dependencies(WebKit2 WebCore ${WEBKIT2_EXTRA_DEPENDENCIES})
add_webkit2_prefix_header(WebKit2)
-target_link_libraries(WebKit2 ${WebKit2_LIBRARIES})
-set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit")
# Suppress unused parameter warnings for sources in WebKit2.
ADD_TARGET_PROPERTIES(WebKit2 COMPILE_FLAGS "-Wno-unused-parameter")
@@ -786,10 +781,6 @@
ADD_TARGET_PROPERTIES(WebKit2 LINK_FLAGS "${WebKit2_VERSION_SCRIPT}")
endif ()
-if (WebKit2_OUTPUT_NAME)
- set_target_properties(WebKit2 PROPERTIES OUTPUT_NAME ${WebKit2_OUTPUT_NAME})
-endif ()
-
add_executable(WebProcess ${WebProcess_SOURCES})
add_webkit2_prefix_header(WebProcess)
target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
@@ -837,9 +828,7 @@
POPULATE_LIBRARY_VERSION(WEBKIT2)
set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
-if (APPLE)
- WEBKIT_FRAMEWORK(WebKit2)
-else ()
+if (NOT APPLE)
install(TARGETS WebKit2 WebProcess NetworkProcess
LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}"
Modified: trunk/Source/WebKit2/ChangeLog (196946 => 196947)
--- trunk/Source/WebKit2/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
@@ -1,3 +1,15 @@
+2016-02-22 Konstantin Tokarev <[email protected]>
+
+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Used WebKit2_SOURCES variable instead of separate
+ WebKit2_DERIVED_SOURCES for compatibility with WEBKIT_FRAMEWORK macro.
+ There is no real need to separate derived sources from others.
+ * PlatformGTK.cmake: Ditto.
+
2016-02-22 Carlos Alberto Lopez Perez <[email protected]>
[CMake] Unreviewed build fix after r196942.
Modified: trunk/Source/cmake/WebKitMacros.cmake (196946 => 196947)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-02-22 19:32:47 UTC (rev 196947)
@@ -243,6 +243,21 @@
endmacro()
macro(WEBKIT_FRAMEWORK _target)
+ include_directories(${${_target}_INCLUDE_DIRECTORIES})
+ include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
+ add_library(${_target} ${${_target}_LIBRARY_TYPE}
+ ${${_target}_HEADERS}
+ ${${_target}_SOURCES}
+ ${${_target}_DERIVED_SOURCES}
+ )
+ target_link_libraries(${_target} ${${_target}_LIBRARIES})
+ set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
+ set_target_properties(${_target} PROPERTIES FOLDER "${_target}")
+
+ if (${_target}_OUTPUT_NAME)
+ set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${${_target}_OUTPUT_NAME})
+ endif ()
+
if (APPLE AND NOT PORT STREQUAL "GTK")
set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE)
install(TARGETS ${_target} FRAMEWORK DESTINATION ${LIB_INSTALL_DIR})
