diff options
| author | Rolf Eike Beer <eb@emlix.com> | 2022-09-22 09:44:46 +0200 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2022-11-23 08:44:48 -0500 |
| commit | ceb4d153fc6591ac714b1caeb446ab7ff1d67133 (patch) | |
| tree | a334a8b06af2db3935aeb1654fcb2f49219c615b /src/CMakeLists.txt | |
| parent | 903756f8662d592e05caf87406575002ee1c8377 (diff) | |
| download | lighttpd-git-ceb4d153fc6591ac714b1caeb446ab7ff1d67133.tar.gz | |
[cmake] remove wolfssl code that would already be handled by CMake
github: #121
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index afa648db..336cf2ff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -393,27 +393,19 @@ endif() if(WITH_WOLFSSL) pkg_check_modules(WOLFSSL QUIET wolfssl) - if(NOT ${WITH_WOLFSSL} EQUAL "") - find_path(WOLFSSL_INCLUDE_DIR wolfssl/ssl.h ${WITH_WOLFSSL}/include) - elseif(WOLFSSL_FOUND) - set(WOLFSSL_INCLUDE_DIR ${WOLFSSL_INCLUDE_DIRS}) - elseif(APPLE) - find_path(WOLFSSL_INCLUDE_DIR wolfssl/ssl.h /opt/local/include) - else() - find_path(WOLFSSL_INCLUDE_DIR wolfssl/ssl.h /usr/local/include) - endif() - if(NOT ${WITH_WOLFSSL} EQUAL "") - find_library(WOLFSSL_LIBRARY - NAMES wolfssl - PATHS ${WITH_WOLFSSL}/lib - ) - elseif(WOLFSSL_FOUND) - set(WOLFSSL_LIBRARY ${WOLFSSL_LIBRARY_DIRS}) + if(WOLFSSL_FOUND) + set(WOLFSSL_INCLUDE_DIR ${WOLFSSL_INCLUDE_DIRS}) + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12) + set(WOLFSSL_LIBRARY ${WOLFSSL_LINK_LIBRARIES}) + else() + set(WOLFSSL_LIBRARY ${WOLFSSL_LIBRARIES}) + endif() else() + find_path(WOLFSSL_INCLUDE_DIR NAMES wolfssl/ssl.h PATHS ${WITH_WOLFSSL}) find_library(WOLFSSL_LIBRARY NAMES wolfssl - PATHS /usr/local/lib /opt/local/lib /usr/lib + PATHS ${WITH_WOLFSSL} ) endif() @@ -441,7 +433,7 @@ if(WITH_WOLFSSL) endif() set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_LIBRARIES) - include_directories(${WOLFSSL_INCLUDE_DIR} ${WOLFSSL_INCLUDE_DIR}/wolfssl) + include_directories(${WOLFSSL_INCLUDE_DIR}) endif() unset(WOLFSSL_LIBRARY) unset(WOLFSSL_INCLUDE_DIR) |