Title: [197056] trunk
- Revision
- 197056
- Author
- commit-qu...@webkit.org
- Date
- 2016-02-24 15:47:25 -0800 (Wed, 24 Feb 2016)
Log Message
[cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
https://bugs.webkit.org/show_bug.cgi?id=154651
Patch by Konstantin Tokarev <annu...@yandex.ru> on 2016-02-24
Reviewed by Alex Christensen.
.:
* Source/cmake/WebKitMacros.cmake:
Source/_javascript_Core:
* CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.
Source/WebCore:
No new tests needed.
* CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.
Source/WTF:
* CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.
Modified Paths
Diff
Modified: trunk/ChangeLog (197055 => 197056)
--- trunk/ChangeLog 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/ChangeLog 2016-02-24 23:47:25 UTC (rev 197056)
@@ -1,3 +1,12 @@
+2016-02-24 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
+ https://bugs.webkit.org/show_bug.cgi?id=154651
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/WebKitMacros.cmake:
+
2016-02-22 Konstantin Tokarev <annu...@yandex.ru>
[cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (197055 => 197056)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2016-02-24 23:47:25 UTC (rev 197056)
@@ -1312,14 +1312,6 @@
WEBKIT_WRAP_SOURCELIST(${_javascript_Core_SOURCES})
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)
-endif ()
-
-if (_javascript_Core_POST_BUILD_COMMAND)
- add_custom_command(TARGET _javascript_Core POST_BUILD COMMAND ${_javascript_Core_POST_BUILD_COMMAND} VERBATIM)
-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})
Modified: trunk/Source/_javascript_Core/ChangeLog (197055 => 197056)
--- trunk/Source/_javascript_Core/ChangeLog 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-02-24 23:47:25 UTC (rev 197056)
@@ -1,3 +1,12 @@
+2016-02-24 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
+ https://bugs.webkit.org/show_bug.cgi?id=154651
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.
+
2016-02-24 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r197033.
Modified: trunk/Source/WTF/ChangeLog (197055 => 197056)
--- trunk/Source/WTF/ChangeLog 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/WTF/ChangeLog 2016-02-24 23:47:25 UTC (rev 197056)
@@ -1,3 +1,12 @@
+2016-02-24 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
+ https://bugs.webkit.org/show_bug.cgi?id=154651
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.
+
2016-02-23 Dan Bernstein <m...@apple.com>
[Xcode] Linker errors display mangled names, but no longer should
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (197055 => 197056)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2016-02-24 23:47:25 UTC (rev 197056)
@@ -290,7 +290,3 @@
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
endif ()
-
-if (WTF_PRE_BUILD_COMMAND)
- add_custom_command(TARGET WTF PRE_BUILD COMMAND ${WTF_PRE_BUILD_COMMAND} VERBATIM)
-endif ()
Modified: trunk/Source/WebCore/CMakeLists.txt (197055 => 197056)
--- trunk/Source/WebCore/CMakeLists.txt 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-02-24 23:47:25 UTC (rev 197056)
@@ -3788,15 +3788,6 @@
ADD_TARGET_PROPERTIES(WebCore COMPILE_FLAGS "-fno-tree-sra")
endif ()
-if (WebCore_PRE_BUILD_COMMAND)
- add_custom_target(WebCorePreBuild COMMAND ${WebCore_PRE_BUILD_COMMAND} VERBATIM)
- add_dependencies(WebCore WebCorePreBuild)
-endif ()
-
-if (WebCore_POST_BUILD_COMMAND)
- add_custom_command(TARGET WebCore POST_BUILD COMMAND ${WebCore_POST_BUILD_COMMAND} VERBATIM)
-endif ()
-
if (MSVC)
ADD_PRECOMPILED_HEADER("WebCoreTestSupportPrefix.h" "testing/js/WebCoreTestSupportPrefix.cpp" WebCoreTestSupport_SOURCES)
endif ()
Modified: trunk/Source/WebCore/ChangeLog (197055 => 197056)
--- trunk/Source/WebCore/ChangeLog 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/WebCore/ChangeLog 2016-02-24 23:47:25 UTC (rev 197056)
@@ -1,3 +1,14 @@
+2016-02-24 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
+ https://bugs.webkit.org/show_bug.cgi?id=154651
+
+ Reviewed by Alex Christensen.
+
+ No new tests needed.
+
+ * CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.
+
2016-02-24 Ryosuke Niwa <rn...@webkit.org>
Use more references in FocusNavigationScope
Modified: trunk/Source/cmake/WebKitMacros.cmake (197055 => 197056)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-02-24 23:47:25 UTC (rev 197056)
@@ -258,6 +258,14 @@
set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${${_target}_OUTPUT_NAME})
endif ()
+ if (${_target}_PRE_BUILD_COMMAND)
+ add_custom_command(TARGET ${_target} PRE_BUILD COMMAND ${${_target}_PRE_BUILD_COMMAND} VERBATIM)
+ endif ()
+
+ if (${_target}_POST_BUILD_COMMAND)
+ add_custom_command(TARGET _javascript_Core POST_BUILD COMMAND ${${_target}_POST_BUILD_COMMAND} VERBATIM)
+ endif ()
+
if (APPLE AND NOT PORT STREQUAL "GTK")
set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE)
install(TARGETS ${_target} FRAMEWORK DESTINATION ${LIB_INSTALL_DIR})
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
