From b087c964d473fe3a9f978a4bdc4f1b5bcb02481e Mon Sep 17 00:00:00 2001 From: Matias Fontanini Date: Sat, 27 Feb 2016 07:50:56 -0800 Subject: [PATCH] Don't fail configuration if openssl is missing --- CMakeLists.txt | 10 +++++++--- cmake/appveyor.yml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da73488..a4dbe41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,9 +98,13 @@ IF(LIBTINS_ENABLE_DOT11) SET(TINS_HAVE_DOT11 ON) MESSAGE(STATUS "Enabling IEEE 802.11 support.") IF(LIBTINS_ENABLE_WPA2) - FIND_PACKAGE(OpenSSL REQUIRED) - SET(TINS_HAVE_WPA2_DECRYPTION ON) - MESSAGE(STATUS "Enabling WPA2 decryption support.") + FIND_PACKAGE(OpenSSL) + IF(OPENSSL_FOUND) + SET(TINS_HAVE_WPA2_DECRYPTION ON) + MESSAGE(STATUS "Enabling WPA2 decryption support.") + ELSE() + MESSAGE(WARNING "Disabling WPA2 decryption support since OpenSSL was not found") + ENDIF() ELSE(LIBTINS_ENABLE_WPA2) MESSAGE(STATUS "Disabling WPA2 decryption support.") ENDIF(LIBTINS_ENABLE_WPA2) diff --git a/cmake/appveyor.yml b/cmake/appveyor.yml index 3b69ee6..a39ad02 100644 --- a/cmake/appveyor.yml +++ b/cmake/appveyor.yml @@ -19,7 +19,7 @@ before_build: - mkdir build - cd build - if "%platform%"=="x64" ( set GENERATOR="Visual Studio 12 Win64" ) else ( set GENERATOR="Visual Studio 12" ) -- cmake .. -G %GENERATOR% -DPCAP_ROOT_DIR=c:\WpdPack -DLIBTINS_BUILD_SHARED=0 -DLIBTINS_ENABLE_WPA2=0 -DLIBTINS_ENABLE_CXX11=1 +- cmake .. -G %GENERATOR% -DPCAP_ROOT_DIR=c:\WpdPack -DLIBTINS_BUILD_SHARED=0 build: project: C:/projects/libtins/build/libtins.sln verbosity: minimal