diff options
| author | Sebastian Leske <sebastian.leske@sleske.name> | 2017-11-02 22:33:27 +0100 |
|---|---|---|
| committer | Sebastian Leske <sebastian.leske@sleske.name> | 2017-11-03 00:04:24 +0100 |
| commit | 0b6027ff53acb558c2b200a1b3b8874f8259843a (patch) | |
| tree | 68b3715b0fdedc870f6157c27a0403d2345e20b3 | |
| parent | bd3e8e965236d9b2e25231518f864c32a3d74674 (diff) | |
| download | navit-0b6027ff53acb558c2b200a1b3b8874f8259843a.tar.gz | |
Fix:core:Remove dependency on OpenSSL
Remove the dependency on OpenSSL, which is problematic because OpenSSL's
license is incompatible with the GPL. Fixes trac 1350. Also see PR #212.
| -rwxr-xr-x | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | config.h.cmake | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d3d764d36..763f75bed 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,7 +163,6 @@ find_package(Gettext) find_package(PNG) find_package(DBusGLib) find_package(PythonLibs) -find_package(OpenSSL) find_package(Threads) libfind_pkg_check_modules(FONTCONFIG fontconfig) #Qt detection @@ -276,11 +275,6 @@ else(ZLIB_FOUND) message(STATUS "using internal zlib") set_with_reason(support/zlib "native zlib missing" TRUE) endif(ZLIB_FOUND) -if(OPENSSL_CRYPTO_LIBRARIES) - set(HAVE_LIBCRYPTO 1) - include_directories(${OPENSSL_INCLUDE_DIR}) - list(APPEND NAVIT_LIBS ${OPENSSL_CRYPTO_LIBRARIES}) -endif() if(PNG_FOUND) set(HAVE_PNG 1) include_directories(${PNG_INCLUDE_DIR}) diff --git a/config.h.cmake b/config.h.cmake index fa096b58c..dd27d1ee5 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -21,8 +21,6 @@ #cmakedefine PACKAGE "@PACKAGE@" #cmakedefine LOCALEDIR "@LOCALEDIR@" -#cmakedefine HAVE_LIBCRYPTO 1 - #cmakedefine HAVE_ZLIB 1 #cmakedefine USE_ROUTING 1 |