[vidalia-svn] r2637: Merge the CMake fu for building miniupnpc into trunk. (in vidalia: . trunk trunk/src)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-06-01 19:42:50 -0400 (Sun, 01 Jun 2008)
New Revision: 2637

Modified:
   vidalia/
   vidalia/trunk/CMakeLists.txt
   vidalia/trunk/INSTALL
   vidalia/trunk/src/CMakeLists.txt
Log:
 r411@thebe:  edmanm | 2008-06-01 19:00:21 -0400
 Merge the CMake fu for building miniupnpc into trunk.



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

Modified: vidalia/trunk/CMakeLists.txt
===================================================================
--- vidalia/trunk/CMakeLists.txt	2008-06-01 23:42:48 UTC (rev 2636)
+++ vidalia/trunk/CMakeLists.txt	2008-06-01 23:42:50 UTC (rev 2637)
@@ -70,9 +70,6 @@
 
 ## 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/trunk/INSTALL
===================================================================
--- vidalia/trunk/INSTALL	2008-06-01 23:42:48 UTC (rev 2636)
+++ vidalia/trunk/INSTALL	2008-06-01 23:42:50 UTC (rev 2637)
@@ -183,6 +183,8 @@
   -DUSE_QSSLSOCKET=0                      Disable building Vidalia with SSL
                                           support.
 
+  -DUSE_MINIUPNPC=1                       Build Vidalia with UPnP support.
+
   -DOSX_FAT_BINARY=1                      Build Vidalia as a Universal binary.
 
   -DQT_QMAKE_EXECUTABLE=/path/to/qmake    Specifies the location of Qt's
@@ -206,8 +208,3 @@
 'cmake --help' or 'man cmake' (on non-Windows platforms) for more information
 about supported generators and configuration options.
 
-Including UPnP support
-----------------------
-
-cmake -G "MSYS Makefiles" -DMINIUPNPC_LIBRARY_DIR="/usr/local/lib" -DMINIUPNPC_INCLUDE_DIR="/usr/local/include" .
-

Modified: vidalia/trunk/src/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/CMakeLists.txt	2008-06-01 23:42:48 UTC (rev 2636)
+++ vidalia/trunk/src/CMakeLists.txt	2008-06-01 23:42:50 UTC (rev 2637)
@@ -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)