[cmake][Mac] Unreviewed, fix linking WebKitSystemInterface
authorannulen@yandex.ru <annulen@yandex.ru@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Jul 2017 21:26:15 +0000 (21:26 +0000)
committerannulen@yandex.ru <annulen@yandex.ru@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Jul 2017 21:26:15 +0000 (21:26 +0000)
After r219560 link_directories() in PlatformXXX.cmake files does not
affect corresponding targets.

* PlatformMac.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219745 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/PlatformMac.cmake

index f9278a8..6a1a5b1 100644 (file)
@@ -1,3 +1,12 @@
+2017-07-21  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake][Mac] Unreviewed, fix linking WebKitSystemInterface
+
+        After r219560 link_directories() in PlatformXXX.cmake files does not
+        affect corresponding targets.
+
+        * PlatformMac.cmake:
+
 2017-07-21  Sam Weinig  <sam@webkit.org>
 
         [WebIDL] Remove the need for the side map of DeprecatedCSSOMValue roots
index 9486174..811d45d 100644 (file)
@@ -1,11 +1,10 @@
 if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
-elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
+    set(WEBKITSYSTEMINTERFACE_LIBRARY ../../WebKitLibraries/libWebKitSystemInterfaceMavericks.a)
+elseif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
+    set(WEBKITSYSTEMINTERFACE_LIBRARY ../../WebKitLibraries/libWebKitSystemInterfaceYosemite.a)
 else ()
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
+    set(WEBKITSYSTEMINTERFACE_LIBRARY ../../WebKitLibraries/libWebKitSystemInterfaceElCapitan.a)
 endif ()
-link_directories(../../WebKitLibraries)
 
 find_library(ACCELERATE_LIBRARY accelerate)
 find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
index a49899c..7d2a6f2 100644 (file)
@@ -1,3 +1,12 @@
+2017-07-21  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake][Mac] Unreviewed, fix linking WebKitSystemInterface
+
+        After r219560 link_directories() in PlatformXXX.cmake files does not
+        affect corresponding targets.
+
+        * PlatformMac.cmake:
+
 2017-07-21  Andreas Kling  <akling@apple.com>
 
         Use more references in event dispatch code
index 11c1ddf..6358faf 100644 (file)
@@ -1,5 +1,4 @@
 add_definitions("-ObjC++ -std=c++14")
-link_directories(../../WebKitLibraries)
 find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
 find_library(CARBON_LIBRARY Carbon)
 find_library(QUARTZ_LIBRARY Quartz)
index a0700ec..a5d2b25 100644 (file)
@@ -1,3 +1,12 @@
+2017-07-21  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake][Mac] Unreviewed, fix linking WebKitSystemInterface
+
+        After r219560 link_directories() in PlatformXXX.cmake files does not
+        affect corresponding targets.
+
+        * PlatformMac.cmake:
+
 2017-07-21  Brady Eidson  <beidson@apple.com>
 
         Get rid of WebCore IconDatabase code.
index cc4acc5..6b82f17 100644 (file)
@@ -2,7 +2,6 @@ find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
 find_library(QUARTZ_LIBRARY Quartz)
 add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
 add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
-link_directories(../../WebKitLibraries)
 
 list(APPEND WebKit_INCLUDE_DIRECTORIES
     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"