aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2010-05-18 18:41:36 -0300
committerRenato Filho <renato.filho@openbossa.org>2010-05-19 14:26:13 -0300
commit43263681e7ba8f74dc7150cd049774350718bf84 (patch)
tree3be003b8671a2b1ce6cf802648a1e87e70f91bb9
parentb7343f255c77ae822eaf07c6ac10035863ca188f (diff)
Fix dynamic linking in various modules.
Author: Didier Raboud <didier@raboud.com> Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>, Luciano Wolf <luciano.wolf@openbossa.org>
-rw-r--r--PySide/QtMultimedia/CMakeLists.txt1
-rw-r--r--PySide/QtSvg/CMakeLists.txt1
-rw-r--r--PySide/QtTest/CMakeLists.txt2
-rw-r--r--PySide/QtUiTools/CMakeLists.txt1
-rw-r--r--PySide/QtWebKit/CMakeLists.txt2
5 files changed, 5 insertions, 2 deletions
diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt
index 03e593413..ea1b75c4d 100644
--- a/PySide/QtMultimedia/CMakeLists.txt
+++ b/PySide/QtMultimedia/CMakeLists.txt
@@ -35,6 +35,7 @@ target_link_libraries(QtMultimedia
${PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY}
${QT_QTMULTIMEDIA_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
)
add_dependencies(QtMultimedia QtGui)
diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt
index 2efa80326..2935127e8 100644
--- a/PySide/QtSvg/CMakeLists.txt
+++ b/PySide/QtSvg/CMakeLists.txt
@@ -52,6 +52,7 @@ target_link_libraries(QtSvg
${PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY}
${QT_QTSVG_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
)
add_dependencies(QtSvg QtGui)
diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt
index aae9bb94a..bfb23f5c2 100644
--- a/PySide/QtTest/CMakeLists.txt
+++ b/PySide/QtTest/CMakeLists.txt
@@ -36,11 +36,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
add_library(QtTest MODULE ${QtTest_SRC})
set_property(TARGET QtTest PROPERTY PREFIX "")
target_link_libraries(QtTest
- pyside
${PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY}
${QT_QTTEST_LIBRARY}
${QT_QTGUI_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
)
add_dependencies(QtTest QtGui)
diff --git a/PySide/QtUiTools/CMakeLists.txt b/PySide/QtUiTools/CMakeLists.txt
index 1145f976f..1d07c8911 100644
--- a/PySide/QtUiTools/CMakeLists.txt
+++ b/PySide/QtUiTools/CMakeLists.txt
@@ -27,7 +27,6 @@ target_link_libraries(QtUiTools
${PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
- ${QT_QTXML_LIBRARY}
${QT_QTUITOOLS_LIBRARY})
add_dependencies(QtUiTools QtGui QtXml)
diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt
index 82c550ca1..71b62ed5d 100644
--- a/PySide/QtWebKit/CMakeLists.txt
+++ b/PySide/QtWebKit/CMakeLists.txt
@@ -68,6 +68,8 @@ target_link_libraries(QtWebKit
${PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
+ ${QT_QTNETWORK_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
)
add_dependencies(QtWebKit QtGui)
add_dependencies(QtWebKit QtNetwork)