Changeset 197056 in webkit

Timestamp:

Feb 24, 2016, 3:47:25 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
​https://bugs.webkit.org/show_bug.cgi?id=154651

Patch by Konstantin Tokarev <Konstantin Tokarev> on 2016-02-24
Reviewed by Alex Christensen.

.:

• Source/cmake/WebKitMacros.cmake:

Source/JavaScriptCore:

• 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.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/CMakeLists.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/CMakeLists.txt (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/cmake/WebKitMacros.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2016-02-24  Konstantin Tokarev  <annulen@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  <annulen@yandex.ru>
 

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -1313 +1313 @@
 WEBKIT_FRAMEWORK(JavaScriptCore)
 
-if (JavaScriptCore_PRE_BUILD_COMMAND)
-    add_custom_command(TARGET JavaScriptCore PRE_BUILD COMMAND ${JavaScriptCore_PRE_BUILD_COMMAND} VERBATIM)
-endif ()
-
-if (JavaScriptCore_POST_BUILD_COMMAND)
-    add_custom_command(TARGET JavaScriptCore POST_BUILD COMMAND ${JavaScriptCore_POST_BUILD_COMMAND} VERBATIM)
-endif ()
-
 if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
     POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-02-24  Konstantin Tokarev  <annulen@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-queue@webkit.org>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-02-24  Konstantin Tokarev  <annulen@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  <mitz@apple.com>
 

trunk/Source/WTF/wtf/CMakeLists.txt

@@ -291 +291 @@
     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 ()

trunk/Source/WebCore/CMakeLists.txt

@@ -3789 +3789 @@
 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)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-24  Konstantin Tokarev  <annulen@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  <rniwa@webkit.org>
 

trunk/Source/cmake/WebKitMacros.cmake

@@ -259 +259 @@
     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 JavaScriptCore POST_BUILD COMMAND ${${_target}_POST_BUILD_COMMAND} VERBATIM)
+    endif ()
+
     if (APPLE AND NOT PORT STREQUAL "GTK")
         set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE)