From c50702612df7453736cea37e6189eaedfca99e5c Mon Sep 17 00:00:00 2001 From: Luis Diaz Mas Date: Thu, 17 Aug 2017 22:58:47 +0200 Subject: [PATCH] Simplify CMake code for handling SSH and CURL cases --- src/CMakeLists.txt | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7f6aa7fe..6c89047b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -145,33 +145,17 @@ SET( LIBEXIV2_SRC asfvideo.cpp utilsvideo.cpp ) -IF( EXIV2_ENABLE_WEBREADY ) - ## - # add curl support - IF( EXIV2_ENABLE_CURL ) - IF( CURL_FOUND ) - SET( LIBEXIV2_SRC ${LIBEXIV2_SRC} - easyaccess.cpp - ) - set( LIBEXIV2_HDR ${LIBEXIV2_HDR} - ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/easyaccess.hpp - ) - ENDIF() - ENDIF() +if( EXIV2_ENABLE_WEBREADY ) + if( EXIV2_ENABLE_CURL) + set( LIBEXIV2_SRC ${LIBEXIV2_SRC} easyaccess.cpp) + set( LIBEXIV2_HDR ${LIBEXIV2_HDR} ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/easyaccess.hpp) + endif() - ## - # add ssh support - IF( EXIV2_ENABLE_SSH ) - IF( SSH_FOUND ) - SET( LIBEXIV2_SRC ${LIBEXIV2_SRC} - ssh.cpp - ) - set( LIBEXIV2_HDR ${LIBEXIV2_HDR} - ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/ssh.hpp - ) - ENDIF() - ENDIF() -ENDIF( EXIV2_ENABLE_WEBREADY ) + if( EXIV2_ENABLE_SSH ) + set( LIBEXIV2_SRC ${LIBEXIV2_SRC} ssh.cpp) + set( LIBEXIV2_HDR ${LIBEXIV2_HDR} ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/ssh.hpp) + endif() +endif( EXIV2_ENABLE_WEBREADY ) ## # add png*.cpp files if PNG support requested