[vidalia-svn] r3031: Add OPENSSL_BINARY_DIR and MINGW_BINARY_DIR cmake options th (vidalia/trunk/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-09-01 23:42:17 -0400 (Mon, 01 Sep 2008)
New Revision: 3031

Modified:
   vidalia/trunk/pkg/win32/CMakeLists.txt
   vidalia/trunk/pkg/win32/vidalia.nsi.in
Log:
Add OPENSSL_BINARY_DIR and MINGW_BINARY_DIR cmake options that can be
used to specify where the Windows installer NSIS scripts should look
for those dlls.


Modified: vidalia/trunk/pkg/win32/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/win32/CMakeLists.txt	2008-09-02 01:51:40 UTC (rev 3030)
+++ vidalia/trunk/pkg/win32/CMakeLists.txt	2008-09-02 03:42:17 UTC (rev 3031)
@@ -10,6 +10,18 @@
 ##  the terms described in the LICENSE file.
 ##
 
+if (MINGW)
+  if (NOT MINGW_BINARY_DIR)
+    set(MINGW_BINARY_DIR ${Vidalia_BINARY_DIR}/bin)
+  endif(NOT MINGW_BINARY_DIR)
+endif(MINGW)
+
+if (USE_QSSLSOCKET)
+  if (NOT OPENSSL_BINARY_DIR)
+    set(OPENSSL_BINARY_DIR ${Vidalia_BINARY_DIR}/bin)
+  endif(NOT OPENSSL_BINARY_DIR)
+endif(USE_QSSLSOCKET)
+
 ## Windows Packages
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/vidalia.nsi.in

Modified: vidalia/trunk/pkg/win32/vidalia.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia.nsi.in	2008-09-02 01:51:40 UTC (rev 3030)
+++ vidalia/trunk/pkg/win32/vidalia.nsi.in	2008-09-02 03:42:17 UTC (rev 3031)
@@ -138,8 +138,8 @@
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
   File "@Vidalia_BINARY_DIR@\src\vidalia\${VIDALIA_EXEC}"
-  File "..\..\bin\mingwm10.dll"
-  File "..\..\bin\ssleay32.dll"
+  File "@MINGW_BINARY_DIR@\mingwm10.dll"
+  File "@OPENSSL_BINARY_DIR@\ssleay32.dll"
   File "@QT_BINARY_DIR@\QtCore4.dll"
   File "@QT_BINARY_DIR@\QtGui4.dll"
   File "@QT_BINARY_DIR@\QtNetwork4.dll"