[vidalia-svn] r2321: Patch for better MSVC support from notbobfischer. Thanks! (in vidalia/trunk: . src src/util)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-01-24 19:18:10 -0500 (Thu, 24 Jan 2008)
New Revision: 2321

Modified:
   vidalia/trunk/
   vidalia/trunk/CMakeLists.txt
   vidalia/trunk/src/CMakeLists.txt
   vidalia/trunk/src/util/CMakeLists.txt
Log:
 r76@lysithea:  edmanm | 2008-01-24 19:18:05 -0500
 Patch for better MSVC support from notbobfischer. Thanks!



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r76] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/CMakeLists.txt
===================================================================
--- vidalia/trunk/CMakeLists.txt	2008-01-24 21:34:10 UTC (rev 2320)
+++ vidalia/trunk/CMakeLists.txt	2008-01-25 00:18:10 UTC (rev 2321)
@@ -44,6 +44,13 @@
 include(CheckIncludeFileCXX)
 include(CPack)
 
+if(MSVC_IDE)
+    # Supress regeneration
+    set(CMAKE_SUPPRESS_REGENERATION TRUE)
+    set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+    set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+endif(MSVC_IDE)
+  
 ## Define Vidalia-specific CMake options
 if (APPLE)
   option(OSX_FAT_BINARY "Build Vidalia as a Universal binary." OFF)

Modified: vidalia/trunk/src/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/CMakeLists.txt	2008-01-24 21:34:10 UTC (rev 2320)
+++ vidalia/trunk/src/CMakeLists.txt	2008-01-25 00:18:10 UTC (rev 2321)
@@ -40,6 +40,10 @@
   endif(OSX_FAT_BINARY)
 endif(APPLE)
 
+if(MSVC)
+  add_definitions(-D_USE_MATH_DEFINES=1)
+endif(MSVC)
+
 ## Add some Qt definitions
 if (WIN32)
   add_definitions(-DQT_THREAD_SUPPORT)

Modified: vidalia/trunk/src/util/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/util/CMakeLists.txt	2008-01-24 21:34:10 UTC (rev 2320)
+++ vidalia/trunk/src/util/CMakeLists.txt	2008-01-25 00:18:10 UTC (rev 2321)
@@ -52,6 +52,13 @@
 target_link_libraries(util ${QT_LIBRARIES})
 
 if(USE_QSSLSOCKET)
-  target_link_libraries(util crypto ssl)
+  target_link_libraries(util)
+  if(UNIX)
+    ## XXX: This is not quite right, since we still may need to link in
+    ##      OpenSSL libs on Windows as well, depending on how Qt was built.
+    ##      It suffices for the default Qt install on Windows though, until we
+    ##      gets some more complex CMake fu in.
+    target_link_libraries(crypto ssl)
+  endif(UNIX)
 endif(USE_QSSLSOCKET)