Changeset 2321

Timestamp:

01/24/08 19:18:10 (12 months ago)

Author:

edmanm

Message:

r76@lysithea: edmanm | 2008-01-24 19:18:05 -0500
Patch for better MSVC support from notbobfischer. Thanks!

Location:

vidalia/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)
• src/util/CMakeLists.txt (modified) (1 diff)

vidalia/trunk/CMakeLists.txt

@@ -45 +45 @@
 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)

vidalia/trunk/src/CMakeLists.txt

@@ -41 +41 @@
 endif(APPLE)
 
+if(MSVC)
+  add_definitions(-D_USE_MATH_DEFINES=1)
+endif(MSVC)
+
 ## Add some Qt definitions
 if (WIN32)

vidalia/trunk/src/util/CMakeLists.txt

@@ -53 +53 @@
 
 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)