Changeset 244349 in webkit

Timestamp:

Apr 16, 2019 11:51:29 AM (5 years ago)

Author:

don.olmstead@sony.com

Message:

[CMake] Set WTF_SCRIPTS_DIR
​https://bugs.webkit.org/show_bug.cgi?id=196917

Reviewed by Konstantin Tokarev.

.:

Define WTF_SCRIPTS_DIR in WebKitFS.cmake and use that within the WEBKIT_COMPUTE_SOURCES
macro. This allows it to be overridden by a port such as the AppleWin internal build.

• Source/cmake/OptionsAppleWin.cmake:
• Source/cmake/OptionsWinCairo.cmake:
• Source/cmake/WebKitFS.cmake:
• Source/cmake/WebKitMacros.cmake:

Source/WTF:

Use WTF_SCRIPTS_DIR for copying the unified sources script.

• wtf/CMakeLists.txt:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/CMakeLists.txt (modified) (1 diff)
• Source/cmake/OptionsAppleWin.cmake (modified) (1 diff)
• Source/cmake/OptionsWinCairo.cmake (modified) (1 diff)
• Source/cmake/WebKitFS.cmake (modified) (1 diff)
• Source/cmake/WebKitMacros.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2019-04-16  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Set WTF_SCRIPTS_DIR
+        https://bugs.webkit.org/show_bug.cgi?id=196917
+
+        Reviewed by Konstantin Tokarev.
+
+        Define WTF_SCRIPTS_DIR in WebKitFS.cmake and use that within the WEBKIT_COMPUTE_SOURCES
+        macro. This allows it to be overridden by a port such as the AppleWin internal build.
+
+        * Source/cmake/OptionsAppleWin.cmake:
+        * Source/cmake/OptionsWinCairo.cmake:
+        * Source/cmake/WebKitFS.cmake:
+        * Source/cmake/WebKitMacros.cmake:
+
 2019-04-15  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-04-16  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Set WTF_SCRIPTS_DIR
+        https://bugs.webkit.org/show_bug.cgi?id=196917
+
+        Reviewed by Konstantin Tokarev.
+
+        Use WTF_SCRIPTS_DIR for copying the unified sources script.
+
+        * wtf/CMakeLists.txt:
+
 2019-04-15  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WTF/wtf/CMakeLists.txt

@@ -528 +528 @@
 endif ()
 
-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/wtf/Scripts)
-
 file(COPY
     ../Scripts/generate-unified-source-bundles.rb
     DESTINATION
-    ${FORWARDING_HEADERS_DIR}/wtf/Scripts
-)
+    ${WTF_SCRIPTS_DIR}
+)

trunk/Source/cmake/OptionsAppleWin.cmake

@@ -74 +74 @@
 
 if (INTERNAL_BUILD)
+    set(WTF_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/WTF/Scripts")
     set(JavaScriptCore_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore/Scripts")
 endif ()

trunk/Source/cmake/OptionsWinCairo.cmake

@@ -55 +55 @@
 
 # Override scripts directories
+set(WTF_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/WTF/Scripts)
 set(JavaScriptCore_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/Scripts)

trunk/Source/cmake/WebKitFS.cmake

@@ -60 +60 @@
 set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
 
+set(WTF_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/wtf/Scripts")
 set(JavaScriptCore_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts")
 

trunk/Source/cmake/WebKitMacros.cmake

@@ -12 +12 @@
       list(APPEND _sourceListFileTruePaths "${CMAKE_CURRENT_SOURCE_DIR}/${_sourcesListFile}")
     endforeach ()
-
-    if (WIN32 AND INTERNAL_BUILD)
-        set(WTF_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/WTF/Scripts")
-    else ()
-        set(WTF_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/wtf/Scripts")
-    endif ()
 
     if (ENABLE_UNIFIED_BUILDS)