[vidalia-svn] r4379: That previous commit was also supposed to include the CMakeL (in vidalia/trunk/src: common vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2010-08-05 16:29:28 -0400 (Thu, 05 Aug 2010)
New Revision: 4379

Removed:
   vidalia/trunk/src/common/CountryInfo.cpp
   vidalia/trunk/src/common/CountryInfo.h
Modified:
   vidalia/trunk/src/common/CMakeLists.txt
   vidalia/trunk/src/vidalia/CMakeLists.txt
Log:

That previous commit was also supposed to include the CMakeLists.txt
changes as well.


Modified: vidalia/trunk/src/common/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/common/CMakeLists.txt	2010-08-05 20:28:54 UTC (rev 4378)
+++ vidalia/trunk/src/common/CMakeLists.txt	2010-08-05 20:29:28 UTC (rev 4379)
@@ -12,7 +12,6 @@
 
 
 set(common_SRCS
-  CountryInfo.cpp
   crypto.cpp
   file.cpp
   html.cpp
@@ -25,7 +24,6 @@
   ZlibByteArray.cpp
 )
 qt4_wrap_cpp(common_SRCS 
-  CountryInfo.h
   TorSocket.h
   TorSslSocket.h
 )

Deleted: vidalia/trunk/src/common/CountryInfo.cpp

Deleted: vidalia/trunk/src/common/CountryInfo.h

Modified: vidalia/trunk/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/vidalia/CMakeLists.txt	2010-08-05 20:28:54 UTC (rev 4378)
+++ vidalia/trunk/src/vidalia/CMakeLists.txt	2010-08-05 20:29:28 UTC (rev 4379)
@@ -26,6 +26,9 @@
 if (USE_BREAKPAD AND BREAKPAD_INCLUDE_DIR)
   include_directories(${BREAKPAD_INCLUDE_DIR})
 endif(USE_BREAKPAD AND BREAKPAD_INCLUDE_DIR)
+if (USE_GEOIP AND GEOIP_INCLUDE_DIR)
+  include_directories(${GEOIP_INCLUDE_DIR})
+endif(USE_GEOIP AND GEOIP_INCLUDE_DIR)
 
 if (USE_MARBLE)
   if (APPLE OR WIN32)
@@ -181,12 +184,9 @@
 set(vidalia_SRCS ${vidalia_SRCS}
   network/CircuitItem.cpp
   network/CircuitListWidget.cpp
-  network/GeoIpCache.cpp
-  network/GeoIpCacheItem.cpp
-  network/GeoIp.cpp
-  network/GeoIpRequest.cpp
+  network/CountryInfo.cpp
+  network/GeoIpRecord.cpp
   network/GeoIpResolver.cpp
-  network/GeoIpResponse.cpp
   network/NetViewer.cpp
   network/RouterDescriptorView.cpp
   network/RouterInfoDialog.cpp
@@ -196,7 +196,7 @@
 )
 qt4_wrap_cpp(vidalia_SRCS
   network/CircuitListWidget.h
-  network/GeoIpCache.h
+  network/CountryInfo.h
   network/GeoIpResolver.h
   network/NetViewer.h
   network/RouterDescriptorView.h
@@ -224,6 +224,14 @@
     network/ZImageView.h
   )
 endif(USE_MARBLE)
+if (USE_GEOIP)
+  set(vidalia_SRCS ${vidalia_SRCS}
+    network/GeoIpDatabase.cpp
+  )
+  qt4_wrap_cpp(vidalia_SRCS
+    network/GeoIpDatabase.h
+  )
+endif(USE_GEOIP)
 
 ## Main Vidalia sources
 set(vidalia_SRCS ${vidalia_SRCS}
@@ -462,6 +470,9 @@
     ${QT_QTSVG_LIBRARY}
   )
 endif(USE_MARBLE)
+if (USE_GEOIP)
+  target_link_libraries(${vidalia_BIN} ${GEOIP_LIBRARIES})
+endif(USE_GEOIP)
 
 if (WIN32)
   target_link_libraries(${vidalia_BIN}