Merge pull request #226 from correa/cmake-cleanup

Include internal zlib as build option and use standard Find_Package for OpenSSL.

Author: gizmocuz

CMakeLists.txt

@@ -319,15 +319,22 @@ if(USE_STATIC_BOOST)
 else(USE_STATIC_BOOST)
    message(STATUS "Linking against boost dynamic libraries")
 endif(USE_STATIC_BOOST)
-
-FIND_PACKAGE(ZLIB)
-IF(ZLIB_FOUND)
-  MESSAGE(STATUS "ZLIB libraries found at: ${ZLIB_LIBRARIES}")
-  MESSAGE(STATUS "ZLIB includes found at: ${ZLIB_INCLUDE_DIRS}")
-  INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
-else()
-  MESSAGE(FATAL_ERROR "ZLIB not found on your system, see install.txt how to get them installed. (for example 'sudo apt-get install zlib1g-dev')")
-ENDIF(ZLIB_FOUND)
+include_directories(${Boost_INCLUDE_DIRS})
+
+option(USE_BUILTIN_ZLIB "Use builtin zlib library" NO)
+if(USE_BUILTIN_ZLIB)
+  add_subdirectory (zlib)
+  include_directories(${ZLIB_INCLUDE_DIRS})
+else(USE_BUILTIN_ZLIB)
+  find_package(ZLIB REQUIRED)
+  if(ZLIB_FOUND)
+    MESSAGE(STATUS "ZLIB libraries found at: ${ZLIB_LIBRARIES}")
+    MESSAGE(STATUS "ZLIB includes found at: ${ZLIB_INCLUDE_DIRS}")
+    include_directories(${ZLIB_INCLUDE_DIRS})
+  else()
+    MESSAGE(FATAL_ERROR "ZLIB not found on your system, see install.txt how to get them installed. (for example 'sudo apt-get install zlib1g-dev')")
+  endif(ZLIB_FOUND)
+endif(USE_BUILTIN_ZLIB)
 
 FIND_PACKAGE(CURL)
 IF(CURL_FOUND)
@@ -357,31 +364,22 @@ ENDIF(LIBUSB_FOUND)
 #
 # Find MD5/RMD160/SHA library
 #
-find_path(OPENSSL_INCLUDE_DIR openssl/ssl.h)
-find_library(OPENSSL_LIBRARY ssl)
+find_package(OpenSSL)
 if(NOT OPENSSL_INCLUDE_DIR)
   message(SEND_ERROR "Failed to find openssl include files (ssl.h), no HTTPS support")
 endif()
-if(NOT OPENSSL_LIBRARY)
+if(NOT OPENSSL_FOUND)
   message(SEND_ERROR "Failed to find the openssl library, no HTTPS support")
+  find_library(MD_LIBRARY NAMES md)
+  if(MD_LIBRARY)
+    target_link_libraries(domoticz ${MD_LIBRARY})
+  endif(MD_LIBRARY)
 else()
   add_definitions(-DNS_ENABLE_SSL)
-  target_link_libraries(domoticz ${OPENSSL_LIBRARY})
+  include_directories(${OPENSSL_INCLUDE_DIR})
+  target_link_libraries(domoticz ${OPENSSL_LIBRARIES})
 endif()
 
-FIND_LIBRARY(CRYPTO_LIBRARY NAMES crypto)
-IF(CRYPTO_LIBRARY)
-  MESSAGE(STATUS "Crypto library found at: ${CRYPTO_LIBRARY}")
-  target_link_libraries(domoticz ${CRYPTO_LIBRARY})
-ELSE(CRYPTO_LIBRARY)
-  IF(NOT OPENSSL_FOUND)
-    FIND_LIBRARY(MD_LIBRARY NAMES md)
-    IF(MD_LIBRARY)
-      LIST(APPEND ADDITIONAL_LIBS ${MD_LIBRARY})
-    ENDIF(MD_LIBRARY)
-  ENDIF(NOT OPENSSL_FOUND)
-ENDIF(CRYPTO_LIBRARY)
-
 ## support lua popen on Linux platforms
 #IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 # SET(OperatingSystem "Linux")