[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r3840: Merge r3835 and the Marble-related half of r3837 into trunk. (in vidalia/trunk: . src/common src/tools/nsh2po src/tools/po2nsh src/tools/po2ts src/tools/po2wxl src/tools/ts2po src/tools/wixtool src/torcontrol src/vidalia)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r3840: Merge r3835 and the Marble-related half of r3837 into trunk. (in vidalia/trunk: . src/common src/tools/nsh2po src/tools/po2nsh src/tools/po2ts src/tools/po2wxl src/tools/ts2po src/tools/wixtool src/torcontrol src/vidalia)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Thu, 11 Jun 2009 13:57:53 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Thu, 11 Jun 2009 13:57:56 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx

Author: edmanm
Date: 2009-06-11 13:57:53 -0400 (Thu, 11 Jun 2009)
New Revision: 3840

Modified:
   vidalia/trunk/
   vidalia/trunk/src/common/CMakeLists.txt
   vidalia/trunk/src/tools/nsh2po/CMakeLists.txt
   vidalia/trunk/src/tools/po2nsh/CMakeLists.txt
   vidalia/trunk/src/tools/po2ts/CMakeLists.txt
   vidalia/trunk/src/tools/po2wxl/CMakeLists.txt
   vidalia/trunk/src/tools/ts2po/CMakeLists.txt
   vidalia/trunk/src/tools/wixtool/CMakeLists.txt
   vidalia/trunk/src/torcontrol/CMakeLists.txt
   vidalia/trunk/src/vidalia/CMakeLists.txt
Log:

Merge r3835 and the Marble-related half of r3837 into trunk.



Property changes on: vidalia/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/branches/marble:3435-3484
   + /vidalia/branches/breakpad:3835,3837
/vidalia/branches/marble:3435-3484

Modified: vidalia/trunk/src/common/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/common/CMakeLists.txt	2009-06-11 07:03:19 UTC (rev 3839)
+++ vidalia/trunk/src/common/CMakeLists.txt	2009-06-11 17:57:53 UTC (rev 3840)
@@ -38,7 +38,10 @@
 
 
 add_library(common STATIC ${common_SRCS})
-target_link_libraries(common ${QT_LIBRARIES})
+target_link_libraries(common
+  ${QT_QTCORE_LIBRARY}
+  ${QT_QTNETWORK_LIBRARY}
+)
 
 if(OPENSSL_LIBRARIES)
   target_link_libraries(common ${OPENSSL_LIBRARIES})

Modified: vidalia/trunk/src/tools/nsh2po/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/tools/nsh2po/CMakeLists.txt	2009-06-11 07:03:19 UTC (rev 3839)
+++ vidalia/trunk/src/tools/nsh2po/CMakeLists.txt	2009-06-11 17:57:53 UTC (rev 3840)
@@ -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/trunk/src/tools/po2nsh/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/tools/po2nsh/CMakeLists.txt	2009-06-11 07:03:19 UTC (rev 3839)
+++ vidalia/trunk/src/tools/po2nsh/CMakeLists.txt	2009-06-11 17:57:53 UTC (rev 3840)
@@ -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/trunk/src/tools/po2ts/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/tools/po2ts/CMakeLists.txt	2009-06-11 07:03:19 UTC (rev 3839)
+++ vidalia/trunk/src/tools/po2ts/CMakeLists.txt	2009-06-11 17:57:53 UTC (rev 3840)
@@ -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/trunk/src/tools/po2wxl/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/tools/po2wxl/CMakeLists.txt	2009-06-11 07:03:19 UTC (rev 3839)
+++ vidalia/trunk/src/tools/po2wxl/CMakeLists.txt	2009-06-11 17:57:53 UTC (rev 3840)
@@ -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/trunk/src/tools/ts2po/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/tools/ts2po/CMakeLists.txt	2009-06-11 07:03:19 UTC (rev 3839)
+++ vidalia/trunk/src/tools/ts2po/CMakeLists.txt	2009-06-11 17:57:53 UTC (rev 3840)
@@ -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/trunk/src/tools/wixtool/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/tools/wixtool/CMakeLists.txt	2009-06-11 07:03:19 UTC (rev 3839)
+++ vidalia/trunk/src/tools/wixtool/CMakeLists.txt	2009-06-11 17:57:53 UTC (rev 3840)
@@ -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/trunk/src/torcontrol/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/torcontrol/CMakeLists.txt	2009-06-11 07:03:19 UTC (rev 3839)
+++ vidalia/trunk/src/torcontrol/CMakeLists.txt	2009-06-11 17:57:53 UTC (rev 3840)
@@ -57,5 +57,9 @@
 
 
 add_library(torcontrol STATIC  ${torcontrol_SRCS})
-target_link_libraries(torcontrol ${QT_LIBRARIES} common)
+target_link_libraries(torcontrol
+  ${QT_QTCORE_LIBRARY}
+  ${QT_QTNETWORK_LIBRARY}
+  common
+)
 

Modified: vidalia/trunk/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/vidalia/CMakeLists.txt	2009-06-11 07:03:19 UTC (rev 3839)
+++ vidalia/trunk/src/vidalia/CMakeLists.txt	2009-06-11 17:57:53 UTC (rev 3840)
@@ -443,7 +443,6 @@
 ## Link to the Qt libraries and other libraries built as a part of Vidalia
 target_link_libraries(${vidalia_BIN}
   ${QT_LIBRARIES}
-  ${MARBLE_LIBRARIES}
   common
   torcontrol
 )

Prev by Author: [vidalia-svn] r3839: Checkpoint my current Breakpad integration stuff, now that t (vidalia/branches/breakpad/src/vidalia)
Next by Author: [vidalia-svn] r3841: Move the functions for setting up the exception handler and (vidalia/branches/breakpad/src/vidalia)
Previous by thread: [vidalia-svn] r3839: Checkpoint my current Breakpad integration stuff, now that t (vidalia/branches/breakpad/src/vidalia)
Next by thread: [vidalia-svn] r3841: Move the functions for setting up the exception handler and (vidalia/branches/breakpad/src/vidalia)
Index(es):
- Author
- Thread