From 5abf9e050f54b18895bfc035823b46d36f207bfa Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Fri, 29 Dec 2017 22:26:07 +0800 Subject: [PATCH] Remove some package depend Signed-off-by: Jianhui Zhao --- cmake/Modules/FindCyaSSL.cmake | 62 ---------------------------------- src/CMakeLists.txt | 3 -- 2 files changed, 65 deletions(-) delete mode 100755 cmake/Modules/FindCyaSSL.cmake diff --git a/cmake/Modules/FindCyaSSL.cmake b/cmake/Modules/FindCyaSSL.cmake deleted file mode 100755 index a377734..0000000 --- a/cmake/Modules/FindCyaSSL.cmake +++ /dev/null @@ -1,62 +0,0 @@ -if(CYASSL_PREFER_STATIC_LIB) - set(CYASSL_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - if(WIN32) - set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib ${CMAKE_FIND_LIBRARY_SUFFIXES}) - else() - set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) - endif() -endif() - -if(UNIX) - find_package(PkgConfig QUIET) - pkg_check_modules(_WOLFSSL QUIET wolfssl) -endif() - -find_path(WOLFSSL_INCLUDE_DIR NAMES wolfssl/version.h HINTS ${_WOLFSSL_INCLUDEDIR}) -find_library(WOLFSSL_LIBRARY NAMES wolfssl HINTS ${_WOLFSSL_LIBDIR}) -if(WOLFSSL_INCLUDE_DIR AND WOLFSSL_LIBRARY) - set(CYASSL_INCLUDE_DIR ${WOLFSSL_INCLUDE_DIR}) - set(CYASSL_LIBRARY ${WOLFSSL_LIBRARY}) - set(CYASSL_VERSION ${_WOLFSSL_VERSION}) - set(CYASSL_IS_WOLFSSL ON) -else() - if(UNIX) - pkg_check_modules(_CYASSL QUIET cyassl) - endif() - - find_path(CYASSL_INCLUDE_DIR NAMES cyassl/version.h HINTS ${_CYASSL_INCLUDEDIR}) - find_library(CYASSL_LIBRARY NAMES cyassl HINTS ${_CYASSL_LIBDIR}) - set(CYASSL_VERSION ${_CYASSL_VERSION}) - set(CYASSL_IS_WOLFSSL OFF) -endif() - -if(NOT CYASSL_VERSION AND CYASSL_INCLUDE_DIR) - if(CYASSL_IS_WOLFSSL) - file(STRINGS "${CYASSL_INCLUDE_DIR}/wolfssl/version.h" CYASSL_VERSION_STR REGEX "^#define[\t ]+LIBWOLFSSL_VERSION_STRING[\t ]+\"[^\"]+\"") - else() - file(STRINGS "${CYASSL_INCLUDE_DIR}/cyassl/version.h" CYASSL_VERSION_STR REGEX "^#define[\t ]+LIBCYASSL_VERSION_STRING[\t ]+\"[^\"]+\"") - endif() - if(CYASSL_VERSION_STR MATCHES "\"([^\"]+)\"") - set(CYASSL_VERSION "${CMAKE_MATCH_1}") - endif() -endif() - -set(CYASSL_INCLUDE_DIRS ${CYASSL_INCLUDE_DIR}) -set(CYASSL_LIBRARIES ${CYASSL_LIBRARY}) - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(CyaSSL - REQUIRED_VARS - CYASSL_LIBRARY - CYASSL_INCLUDE_DIR - VERSION_VAR - CYASSL_VERSION -) - -mark_as_advanced(WOLFSSL_INCLUDE_DIR WOLFSSL_LIBRARY CYASSL_INCLUDE_DIR CYASSL_LIBRARY) - -if(CYASSL_PREFER_STATIC_LIB) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${CYASSL_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) - unset(CYASSL_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES) -endif() \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4e3593d..f329012 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,9 +5,6 @@ set(UHTTPD_VERSION_PATCH 1) # Check the third party Libraries find_package(Libubox REQUIRED) -find_package(Lua REQUIRED) -find_package(OpenSSL) -find_package(CyaSSL) include_directories(${LIBUBOX_INCLUDE_DIR} ${LUA_INCLUDE_DIR}) set(EXTRA_LIBS ${LIBUBOX_LIBRARIES} ${LUA_LIBRARIES} dl)