Changeset 2334 for vidalia/trunk/CMakeLists.txt

Timestamp:

01/28/08 21:33:38 (10 months ago)

Author:

edmanm

Message:

Add some CMake fu to find the right OpenSSL libs, based on the
FindOpenSSL.cmake module from the CMake distribution. We still need
some more CMake fu to poke at the chosen Qt build to see if OpenSSL
libs are needed or not, but this should work in the common case.

Files:

• vidalia/trunk/CMakeLists.txt (modified) (2 diffs)

vidalia/trunk/CMakeLists.txt

@@ -68 +68 @@
 ## Check for QSslSocket
 check_include_file_cxx("qsslsocket.h" HAVE_QSSLSOCKET_H)
-if(HAVE_QSSLSOCKET_H)
+if (HAVE_QSSLSOCKET_H)
   check_symbol_exists(QT_NO_OPENSSL "QtGlobal" QT_NO_SSL_SUPPORT)
-  if(NOT QT_NO_SSL_SUPPORT)
+  if (NOT QT_NO_SSL_SUPPORT)
     option(USE_QSSLSOCKET "Use Qt's QSslSocket for GeoIP lookups." ON)
   endif(NOT QT_NO_SSL_SUPPORT)
 endif(HAVE_QSSLSOCKET_H)
+if (USE_QSSLSOCKET)
+  if (MSVC OR UNIX)
+    include(${CMAKE_SOURCE_DIR}/cmake/FindOpenSSL.cmake)
+  endif(MSVC OR UNIX)
+endif(USE_QSSLSOCKET)
 
 ## Write out a configuration file
@@ -87 +92 @@
 add_subdirectory(pkg)
 
-## The 'confclean' target removes cached CMake configuration information
-if (WIN32)
-  set(RM_CMD del)
-else (WIN32)
-  set(RM_CMD rm)
-endif(WIN32)
-add_custom_target(confclean ${RM_CMD} CMakeCache.txt)
-