Changeset 246587 in webkit

Timestamp:

Jun 19, 2019, 8:07:31 AM (7 years ago)

Author:

Fujii Hironori

Message:

[CMake][Win] CombinedDomains.json is generated twice in JavaScriptCore_CopyPrivateHeaders and JavaScriptCore projects
​https://bugs.webkit.org/show_bug.cgi?id=198853

Reviewed by Don Olmstead.

JavaScriptCore_CopyPrivateHeaders target needs to have a direct or
indirect dependency of JavaScriptCore target for CMake Visual
Studio generator to eliminate duplicated custom commands.

• CMakeLists.txt: Added JavaScriptCore as a dependency of JavaScriptCore_CopyPrivateHeaders.

Location:

trunk/Source/JavaScriptCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -1298 +1298 @@
     FLATTENED
 )
+# JavaScriptCore_CopyPrivateHeaders needs to have a direct or indirect
+# dependency of JavaScriptCore for CMake Visual Studio generator to
+# eliminate duplicated custom commands. Otherwise,
+# CombinedDomains.json will be generated in both projects.
+add_dependencies(JavaScriptCore_CopyPrivateHeaders JavaScriptCore)
 
 target_include_directories(LLIntSettingsExtractor PRIVATE

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-06-19  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [CMake][Win] CombinedDomains.json is generated twice in JavaScriptCore_CopyPrivateHeaders and JavaScriptCore projects
+        https://bugs.webkit.org/show_bug.cgi?id=198853
+
+        Reviewed by Don Olmstead.
+
+        JavaScriptCore_CopyPrivateHeaders target needs to have a direct or
+        indirect dependency of JavaScriptCore target for CMake Visual
+        Studio generator to eliminate duplicated custom commands.
+
+        * CMakeLists.txt: Added JavaScriptCore as a dependency of JavaScriptCore_CopyPrivateHeaders.
+
 2019-06-18  Yusuke Suzuki  <ysuzuki@apple.com>