[vidalia-svn] r2201: Support building Vidalia with shared Qt libs again. (in trunk/src: . torcontrol util)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-08 00:45:58 -0500 (Sat, 08 Dec 2007)
New Revision: 2201

Modified:
   trunk/src/CMakeLists.txt
   trunk/src/torcontrol/CMakeLists.txt
   trunk/src/util/CMakeLists.txt
Log:
Support building Vidalia with shared Qt libs again.

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2007-12-07 23:07:43 UTC (rev 2200)
+++ trunk/src/CMakeLists.txt	2007-12-08 05:45:58 UTC (rev 2201)
@@ -40,6 +40,14 @@
   endif(OSX_FAT_BINARY)
 endif(APPLE)
 
+## Add some Qt definitions
+if (WIN32)
+  add_definitions(-DQT_THREAD_SUPPORT)
+  if (NOT QT_CONFIG MATCHES "static")
+    add_definitions(-DQT_DLL)
+  endif(NOT QT_CONFIG MATCHES "static")
+endif(WIN32)
+
 add_subdirectory(torcontrol)
 add_subdirectory(util)
 add_subdirectory(vidalia)

Modified: trunk/src/torcontrol/CMakeLists.txt
===================================================================
--- trunk/src/torcontrol/CMakeLists.txt	2007-12-07 23:07:43 UTC (rev 2200)
+++ trunk/src/torcontrol/CMakeLists.txt	2007-12-08 05:45:58 UTC (rev 2201)
@@ -64,4 +64,5 @@
 
 
 add_library(torcontrol STATIC  ${torcontrol_SRCS})
+target_link_libraries(torcontrol ${QT_LIBRARIES} util)
 

Modified: trunk/src/util/CMakeLists.txt
===================================================================
--- trunk/src/util/CMakeLists.txt	2007-12-07 23:07:43 UTC (rev 2200)
+++ trunk/src/util/CMakeLists.txt	2007-12-08 05:45:58 UTC (rev 2201)
@@ -47,4 +47,5 @@
 
 
 add_library(util STATIC ${util_SRCS})
+target_link_libraries(util ${QT_LIBRARIES})