Changeset 207831 in webkit

Timestamp:

Oct 25, 2016 12:14:55 PM (8 years ago)

Author:

Konstantin Tokarev

Message:

[cmake] Check if jscLib and WebKitGUID targets exist before using them
​https://bugs.webkit.org/show_bug.cgi?id=163945

Reviewed by Alex Christensen.

Currently these targets are used under WIN32 condition, however they
are defined in PlatformWin.cmake, causing CMake warnings if port
supports WIN32 but does not use PlatformWin.cmake

Source/JavaScriptCore:

• shell/CMakeLists.txt:

Source/WebKit:

• CMakeLists.txt:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/shell/CMakeLists.txt (modified) (1 diff)
• WebKit/CMakeLists.txt (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-10-25  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake] Check if jscLib and WebKitGUID targets exist before using them
+        https://bugs.webkit.org/show_bug.cgi?id=163945
+
+        Reviewed by Alex Christensen.
+
+        Currently these targets are used under WIN32 condition, however they
+        are defined in PlatformWin.cmake, causing CMake warnings if port
+        supports WIN32 but does not use PlatformWin.cmake
+
+        * shell/CMakeLists.txt:
+
 2016-10-25  JF Bastien  <jfbastien@apple.com>
 

trunk/Source/JavaScriptCore/shell/CMakeLists.txt

@@ -37 +37 @@
 endif ()
 
-if (WIN32)
+if (TARGET jscLib)
     add_dependencies(jsc jscLib)
 endif ()

trunk/Source/WebKit/CMakeLists.txt

@@ -50 +50 @@
 
 add_dependencies(WebKit WebCore)
-if (WIN32)
+if (TARGET WebKitGUID)
     add_dependencies(WebKit WebKitGUID)
 endif ()

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2016-10-25  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake] Check if jscLib and WebKitGUID targets exist before using them
+        https://bugs.webkit.org/show_bug.cgi?id=163945
+
+        Reviewed by Alex Christensen.
+
+        Currently these targets are used under WIN32 condition, however they
+        are defined in PlatformWin.cmake, causing CMake warnings if port
+        supports WIN32 but does not use PlatformWin.cmake
+
+        * CMakeLists.txt:
+
 2016-10-24  Per Arne Vollan  <pvollan@apple.com>