diff --git a/CMakeLists.txt b/CMakeLists.txt index 6db37416e..65eebb17d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -325,7 +325,15 @@ macro_log_feature(GNUTLS_FOUND "GnuTLS" "http://gnutls.org/" TRUE "" "GnuTLS is needed for serving the Playdar/HTTP API via TLS") -macro_optional_find_package(QCA2) +if( TOMAHAWK_QT5 ) + macro_optional_find_package(Qca-qt5) + if(Qca-qt5_DIR) + set(QCA2_FOUND ON CACHE BOOL "QCA2 was found") + set(QCA2_LIBRARIES "qca-qt5" CACHE STRING "QCA2 Qt5 target") + endif() +else() + macro_optional_find_package(QCA2) +endif() macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions necessary for some resolvers and accounts" "http://delta.affinix.com/qca/" TRUE "" "") if( TOMAHAWK_QT5 ) diff --git a/src/accounts/hatchet/CMakeLists.txt b/src/accounts/hatchet/CMakeLists.txt index eb082ffa5..86ebee449 100644 --- a/src/accounts/hatchet/CMakeLists.txt +++ b/src/accounts/hatchet/CMakeLists.txt @@ -13,7 +13,6 @@ endif() include( ${TOMAHAWK_USE_FILE} ) find_package(OpenSSL REQUIRED) -find_package(QCA2 REQUIRED) find_package(websocketpp 0.2.99 REQUIRED) include_directories( diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 238670e55..1e073252f 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -402,10 +402,6 @@ include_directories( ${QTKEYCHAIN_INCLUDE_DIRS} ) -IF(QCA2_FOUND) - INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} ) -ENDIF(QCA2_FOUND) - IF(LIBATTICA_FOUND) SET( libGuiSources ${libGuiSources} AtticaManager.cpp ) INCLUDE_DIRECTORIES( ${LIBATTICA_INCLUDE_DIR} ) @@ -491,6 +487,7 @@ IF(APPLE) ENDIF() IF(QCA2_FOUND) + INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} ) LIST(APPEND LINK_LIBRARIES ${QCA2_LIBRARIES} ) ENDIF(QCA2_FOUND)