[vidalia-svn] r3837: Extend r3835 to all build targets. (in vidalia/branches/breakpad/src: tools/nsh2po tools/po2nsh tools/po2ts tools/po2wxl tools/ts2po tools/wixtool vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-06-11 02:38:12 -0400 (Thu, 11 Jun 2009)
New Revision: 3837

Modified:
   vidalia/branches/breakpad/src/tools/nsh2po/CMakeLists.txt
   vidalia/branches/breakpad/src/tools/po2nsh/CMakeLists.txt
   vidalia/branches/breakpad/src/tools/po2ts/CMakeLists.txt
   vidalia/branches/breakpad/src/tools/po2wxl/CMakeLists.txt
   vidalia/branches/breakpad/src/tools/ts2po/CMakeLists.txt
   vidalia/branches/breakpad/src/tools/wixtool/CMakeLists.txt
   vidalia/branches/breakpad/src/vidalia/CMakeLists.txt
Log:

Extend r3835 to all build targets.


Modified: vidalia/branches/breakpad/src/tools/nsh2po/CMakeLists.txt
===================================================================
--- vidalia/branches/breakpad/src/tools/nsh2po/CMakeLists.txt	2009-06-11 05:19:51 UTC (rev 3836)
+++ vidalia/branches/breakpad/src/tools/nsh2po/CMakeLists.txt	2009-06-11 06:38:12 UTC (rev 3837)
@@ -40,5 +40,7 @@
 add_executable(nsh2po ${nsh2po_SRCS})
 
 ## Link the executable with the appropriate Qt libraries
-target_link_libraries(nsh2po ${QT_LIBRARIES})
+target_link_libraries(nsh2po
+  ${QT_QTCORE_LIBRARY}
+)
 

Modified: vidalia/branches/breakpad/src/tools/po2nsh/CMakeLists.txt
===================================================================
--- vidalia/branches/breakpad/src/tools/po2nsh/CMakeLists.txt	2009-06-11 05:19:51 UTC (rev 3836)
+++ vidalia/branches/breakpad/src/tools/po2nsh/CMakeLists.txt	2009-06-11 06:38:12 UTC (rev 3837)
@@ -19,7 +19,10 @@
 add_executable(po2nsh ${po2nsh_SRCS})
 
 ## Link the executable with the appropriate Qt libraries
-target_link_libraries(po2nsh ${QT_LIBRARIES} common)
+target_link_libraries(po2nsh
+  ${QT_QTCORE_LIBRARY}
+  common
+)
 
 ## Remember the location of po2nsh so we can use it in custom commands
 get_target_property(PO2NSH_EXECUTABLE po2nsh LOCATION)

Modified: vidalia/branches/breakpad/src/tools/po2ts/CMakeLists.txt
===================================================================
--- vidalia/branches/breakpad/src/tools/po2ts/CMakeLists.txt	2009-06-11 05:19:51 UTC (rev 3836)
+++ vidalia/branches/breakpad/src/tools/po2ts/CMakeLists.txt	2009-06-11 06:38:12 UTC (rev 3837)
@@ -19,7 +19,10 @@
 add_executable(po2ts ${po2ts_SRCS})
 
 ## Link the executable with the appropriate Qt libraries
-target_link_libraries(po2ts ${QT_LIBRARIES})
+target_link_libraries(po2ts
+  ${QT_QTCORE_LIBRARY}
+  ${QT_QTXML_LIBRARY}
+)
 
 ## Remember the location of po2ts so we can use it in custom commands
 get_target_property(PO2TS_EXECUTABLE po2ts LOCATION)

Modified: vidalia/branches/breakpad/src/tools/po2wxl/CMakeLists.txt
===================================================================
--- vidalia/branches/breakpad/src/tools/po2wxl/CMakeLists.txt	2009-06-11 05:19:51 UTC (rev 3836)
+++ vidalia/branches/breakpad/src/tools/po2wxl/CMakeLists.txt	2009-06-11 06:38:12 UTC (rev 3837)
@@ -19,7 +19,10 @@
 add_executable(po2wxl ${po2wxl_SRCS})
 
 ## Link the executable with the appropriate Qt libraries
-target_link_libraries(po2wxl ${QT_LIBRARIES})
+target_link_libraries(po2wxl
+  ${QT_QTCORE_LIBRARY}
+  ${QT_QTXML_LIBRARY}
+)
 
 ## Remember the location of po2wxl so we can use it in custom commands
 get_target_property(PO2WXL_EXECUTABLE po2wxl LOCATION)

Modified: vidalia/branches/breakpad/src/tools/ts2po/CMakeLists.txt
===================================================================
--- vidalia/branches/breakpad/src/tools/ts2po/CMakeLists.txt	2009-06-11 05:19:51 UTC (rev 3836)
+++ vidalia/branches/breakpad/src/tools/ts2po/CMakeLists.txt	2009-06-11 06:38:12 UTC (rev 3837)
@@ -40,7 +40,10 @@
 add_executable(ts2po ${ts2po_SRCS})
 
 ## Link the executable with the appropriate Qt libraries
-target_link_libraries(ts2po ${QT_LIBRARIES})
+target_link_libraries(ts2po
+  ${QT_QTCORE_LIBRARY}
+  ${QT_QTXML_LIBRARY}
+)
 
 ## Remember the location of ts2po so we can use it in custom commands
 get_target_property(TS2PO_EXECUTABLE ts2po LOCATION)

Modified: vidalia/branches/breakpad/src/tools/wixtool/CMakeLists.txt
===================================================================
--- vidalia/branches/breakpad/src/tools/wixtool/CMakeLists.txt	2009-06-11 05:19:51 UTC (rev 3836)
+++ vidalia/branches/breakpad/src/tools/wixtool/CMakeLists.txt	2009-06-11 06:38:12 UTC (rev 3837)
@@ -15,7 +15,10 @@
 add_executable(wixtool ${wixtool_SRCS})
 
 ## Link the executable with the appropriate Qt libraries
-target_link_libraries(wixtool ${QT_LIBRARIES})
+target_link_libraries(wixtool
+  ${QT_QTCORE_LIBRARY}
+  ${QT_QTXML_LIBRARY}
+)
 
 ## Remember location so we can use it in custom commands
 get_target_property(WIXTOOL_EXECUTABLE wixtool LOCATION)

Modified: vidalia/branches/breakpad/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/breakpad/src/vidalia/CMakeLists.txt	2009-06-11 05:19:51 UTC (rev 3836)
+++ vidalia/branches/breakpad/src/vidalia/CMakeLists.txt	2009-06-11 06:38:12 UTC (rev 3837)
@@ -440,8 +440,10 @@
 
 ## Link to the Qt libraries and other libraries built as a part of Vidalia
 target_link_libraries(${vidalia_BIN}
-  ${QT_LIBRARIES}
-  ${MARBLE_LIBRARIES}
+  ${QT_QTCORE_LIBRARY}
+  ${QT_QTGUI_LIBRARY}
+  ${QT_QTNETWORK_LIBRARY}
+  ${QT_QTXML_LIBRARY}
   common
   torcontrol
 )
@@ -452,7 +454,10 @@
   target_link_libraries(${vidalia_BIN} ${BREAKPAD_LIBRARIES})
 endif(USE_BREAKPAD)
 if (USE_MARBLE)
-  target_link_libraries(${vidalia_BIN} ${MARBLE_LIBRARIES})
+  target_link_libraries(${vidalia_BIN}
+    ${MARBLE_LIBRARIES}
+    ${QT_QTSVG_LIBRARY}
+  )
 endif(USE_MARBLE)
 
 if (WIN32)