[CMake] Make the removal of transitive library dependencies work with CMake < 2.8.7.

https://bugs.webkit.org/show_bug.cgi?id=80469

Reviewed by Antonio Gomes.

.:

* CMakeLists.txt: Do not set the CMAKE_LINK_INTERFACE_LIBRARIES
variable here; it was introduced in CMake 2.8.7 so we can't depend
on it as we actually support CMake >= 2.8.0.

Source/JavaScriptCore:

* CMakeLists.txt: Manually set the LINK_INTERFACE_LIBRARIES target
property on the library being created.

Source/WebCore:

No new tests, this is a buildsystem change.

* CMakeLists.txt: Manually set the LINK_INTERFACE_LIBRARIES target
property on the library being created.

Source/WebKit:

* CMakeLists.txt: Manually set the LINK_INTERFACE_LIBRARIES target
property on the library being created.

Source/WebKit2:

* CMakeLists.txt: Manually set the LINK_INTERFACE_LIBRARIES target
property on the library being created.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2253a395efa2277ffd224274b93581abd301a2d5..4f81a4542074c09b06f09df0f729796854c8d46c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,9 +46,6 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-# Do not create transitive library dependencies by default
-SET(CMAKE_LINK_INTERFACE_LIBRARIES "")
-
 INCLUDE(WebKitMacros)
 INCLUDE(WebKitFS)
 INCLUDE(WebKitHelpers)

diff --git a/ChangeLog b/ChangeLog
index 710844f12979d5f5d47fd5f4712d741ebfed714f..11e469f6cf518c9e229ede110c9422756d5fc1b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-06  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Make the removal of transitive library dependencies work with CMake < 2.8.7.
+        https://bugs.webkit.org/show_bug.cgi?id=80469
+
+        Reviewed by Antonio Gomes.
+
+        * CMakeLists.txt: Do not set the CMAKE_LINK_INTERFACE_LIBRARIES
+        variable here; it was introduced in CMake 2.8.7 so we can't depend
+        on it as we actually support CMake >= 2.8.0.
+
 2012-03-06  Hajime Morrita  <morrita@chromium.org>
 
         https://bugs.webkit.org/show_bug.cgi?id=79935

diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index 0f704ed5f181001ff91bf2a589e6db73587a2246..3de26f537410b0b055188f5dceeec58667400fbe 100644 (file)
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -301,6 +301,7 @@ INCLUDE_DIRECTORIES(${JavaScriptCore_INCLUDE_DIRECTORIES})
 ADD_DEFINITIONS(-DBUILDING_JavaScriptCore)
 ADD_LIBRARY(${JavaScriptCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES})
 TARGET_LINK_LIBRARIES(${JavaScriptCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARIES})
+SET_TARGET_PROPERTIES(${JavaScriptCore_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
 
 IF (JavaScriptCore_LINK_FLAGS)
     ADD_TARGET_PROPERTIES(${JavaScriptCore_LIBRARY_NAME} LINK_FLAGS "${JavaScriptCore_LINK_FLAGS}")

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index ed0c4176038e8c7232f2543da3adac6844f3db72..a746b18371d253b762d704f120cdf12498aa92b4 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-06  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Make the removal of transitive library dependencies work with CMake < 2.8.7.
+        https://bugs.webkit.org/show_bug.cgi?id=80469
+
+        Reviewed by Antonio Gomes.
+
+        * CMakeLists.txt: Manually set the LINK_INTERFACE_LIBRARIES target
+        property on the library being created.
+
 2012-03-06  Yuqiang Xian  <yuqiang.xian@intel.com>
 
         DFG BasicBlock should group the Phi nodes together and separate them

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index b6bc0558256a598c8cb0d4b9d032f8ae8def2756..07175147d859cebcfa3624052b8eb6f23bd00a95 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -2551,6 +2551,8 @@ ADD_DEFINITIONS(-DBUILDING_WebCore)
 INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
 
 ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
+SET_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
+
 ADD_LIBRARY(${WebCoreTestSupport_LIBRARY_NAME} ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
 
 ADD_DEPENDENCIES(${WebCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_NAME})

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7b7789cfeed9f0b489f1c4aea8ca8db60fe23b5b..eb1fc9ffabc33f53124d69c2385a400d5a555123 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-06  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Make the removal of transitive library dependencies work with CMake < 2.8.7.
+        https://bugs.webkit.org/show_bug.cgi?id=80469
+
+        Reviewed by Antonio Gomes.
+
+        No new tests, this is a buildsystem change.
+
+        * CMakeLists.txt: Manually set the LINK_INTERFACE_LIBRARIES target
+        property on the library being created.
+
 2012-03-06  Lianghui Chen  <liachen@rim.com>
 
         [BlackBerry] Set correct ResourceRequest target type.

diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index b9e46863715622353912aeee64aa5f57652300b3..62f4b31162e5abdb2d4c0a2a73791b53aeac9d1c 100644 (file)
--- a/Source/WebKit/CMakeLists.txt
+++ b/Source/WebKit/CMakeLists.txt
@@ -75,6 +75,7 @@ INCLUDE_DIRECTORIES(${WebKit_INCLUDE_DIRECTORIES})
 ADD_LIBRARY(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
 ADD_DEPENDENCIES(${WebKit_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
 TARGET_LINK_LIBRARIES(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARIES})
+SET_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
 
 IF (WebKit_LINK_FLAGS)
     ADD_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} LINK_FLAGS "${WebKit_LINK_FLAGS}")

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 138c40d35b8e060d663be3868debc88802c41cd0..d65b6b646e622b20cb728158146567cd4fc0fafb 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-06  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Make the removal of transitive library dependencies work with CMake < 2.8.7.
+        https://bugs.webkit.org/show_bug.cgi?id=80469
+
+        Reviewed by Antonio Gomes.
+
+        * CMakeLists.txt: Manually set the LINK_INTERFACE_LIBRARIES target
+        property on the library being created.
+
 2012-03-06  Raphael Kubo da Costa  <kubo@profusion.mobi>
 
         [EFL] Unreviewed; fix the build after r109877.

diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
index 812ee811aebd94137a8e2366b2bdb23ffbc12421..574432e8766519ff8a278a25ffcd5be2439d6b29 100644 (file)
--- a/Source/WebKit2/CMakeLists.txt
+++ b/Source/WebKit2/CMakeLists.txt
@@ -516,6 +516,7 @@ ADD_DEPENDENCIES(${WebKit2_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
 ADD_DEPENDENCIES(${WebKit2_LIBRARY_NAME} ${ForwardingHeaders_NAME})
 ADD_DEPENDENCIES(${WebKit2_LIBRARY_NAME} ${ForwardingNetworkHeaders_NAME})
 TARGET_LINK_LIBRARIES(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARIES})
+SET_TARGET_PROPERTIES(${WebKit2_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
 
 ADD_EXECUTABLE(${WebProcess_NAME} ${WebProcess_SOURCES})
 TARGET_LINK_LIBRARIES(${WebProcess_NAME} ${WebProcess_LIBRARIES})

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 103facba8fc1224c8f10bff42137a2814205fc8c..522e2494ec0003ca4b3f37a1fc92ac48222364be 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-06  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Make the removal of transitive library dependencies work with CMake < 2.8.7.
+        https://bugs.webkit.org/show_bug.cgi?id=80469
+
+        Reviewed by Antonio Gomes.
+
+        * CMakeLists.txt: Manually set the LINK_INTERFACE_LIBRARIES target
+        property on the library being created.
+
 2012-03-06  Hugo Parente Lima  <hugo.lima@openbossa.org>
 
         MiniBrowser --window-size 480x800 www.nytimes.com doesn't paint bottom tiles.