[vidalia-svn] r2563: If USE_MINIUPNPC is set, then build Vidalia with the miniupn (in vidalia: . branches/upnp branches/upnp/src branches/upnp/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-08 20:01:37 -0400 (Thu, 08 May 2008)
New Revision: 2563

Modified:
   vidalia/
   vidalia/branches/upnp/CMakeLists.txt
   vidalia/branches/upnp/src/CMakeLists.txt
   vidalia/branches/upnp/src/vidalia/CMakeLists.txt
Log:
 r284@rae:  edmanm | 2008-05-08 20:01:56 -0400
 If USE_MINIUPNPC is set, then build Vidalia with the miniupnpc library in
 Vidalia's source tree.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r284] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/branches/upnp/CMakeLists.txt
===================================================================
--- vidalia/branches/upnp/CMakeLists.txt	2008-05-09 00:01:35 UTC (rev 2562)
+++ vidalia/branches/upnp/CMakeLists.txt	2008-05-09 00:01:37 UTC (rev 2563)
@@ -67,11 +67,7 @@
 endif(USE_QSSLSOCKET)
 
 ## UPnP support is currently optional (disabled by default)
-
 option(USE_MINIUPNPC "Enable UPnP support using the MiniUPnPc library." OFF)
-#if (USE_MINIUPNPC)
-#  include(${CMAKE_SOURCE_DIR}/cmake/FindMiniUPnPc.cmake)
-#endif(USE_MINIUPNPC)
 
 ## Check for system header files
 check_include_file("limits.h" HAVE_LIMITS_H)

Modified: vidalia/branches/upnp/src/CMakeLists.txt
===================================================================
--- vidalia/branches/upnp/src/CMakeLists.txt	2008-05-09 00:01:35 UTC (rev 2562)
+++ vidalia/branches/upnp/src/CMakeLists.txt	2008-05-09 00:01:37 UTC (rev 2563)
@@ -34,6 +34,12 @@
   endif(NOT QT_CONFIG MATCHES "static")
 endif(WIN32)
 
+if (USE_MINIUPNPC)
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/miniupnpc)
+  link_directories(${CMAKE_CURRENT_BINARY_DIR}/miniupnpc)
+  add_subdirectory(miniupnpc)
+endif(USE_MINIUPNPC)
+
 add_subdirectory(torcontrol)
 add_subdirectory(common)
 add_subdirectory(vidalia)

Modified: vidalia/branches/upnp/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/upnp/src/vidalia/CMakeLists.txt	2008-05-09 00:01:35 UTC (rev 2562)
+++ vidalia/branches/upnp/src/vidalia/CMakeLists.txt	2008-05-09 00:01:37 UTC (rev 2563)
@@ -259,7 +259,7 @@
   torcontrol
 )
 if (USE_MINIUPNPC)
-  target_link_libraries(${vidalia_BIN} ${MINIUPNPC_LIBRARY})
+  target_link_libraries(${vidalia_BIN} miniupnpc)
 endif(USE_MINIUPNPC)
 
 if (MINGW)