mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 07:36:48 +02:00
Code Issues Releases Wiki Activity

Link against correct qca library with Qt5

Browse Source
This commit is contained in:
Dominik Schmidt
2015-01-29 06:11:36 +01:00
parent ca13bb6839
commit 4fa69d9607
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -325,7 +325,15 @@ macro_log_feature(GNUTLS_FOUND "GnuTLS"
"http://gnutls.org/" TRUE "" "http://gnutls.org/" TRUE ""
"GnuTLS is needed for serving the Playdar/HTTP API via TLS") "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 "" "") 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 ) if( TOMAHAWK_QT5 )

1
src/accounts/hatchet/CMakeLists.txt
View File

@@ -13,7 +13,6 @@ endif()
include( ${TOMAHAWK_USE_FILE} ) include( ${TOMAHAWK_USE_FILE} )
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
find_package(QCA2 REQUIRED)
find_package(websocketpp 0.2.99 REQUIRED) find_package(websocketpp 0.2.99 REQUIRED)
include_directories( include_directories(

5
src/libtomahawk/CMakeLists.txt
View File

@@ -402,10 +402,6 @@ include_directories(
${QTKEYCHAIN_INCLUDE_DIRS} ${QTKEYCHAIN_INCLUDE_DIRS}
) )
IF(QCA2_FOUND)
INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
ENDIF(QCA2_FOUND)
IF(LIBATTICA_FOUND) IF(LIBATTICA_FOUND)
SET( libGuiSources ${libGuiSources} AtticaManager.cpp ) SET( libGuiSources ${libGuiSources} AtticaManager.cpp )
INCLUDE_DIRECTORIES( ${LIBATTICA_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${LIBATTICA_INCLUDE_DIR} )
@@ -491,6 +487,7 @@ IF(APPLE)
ENDIF() ENDIF()
IF(QCA2_FOUND) IF(QCA2_FOUND)
INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
LIST(APPEND LINK_LIBRARIES ${QCA2_LIBRARIES} ) LIST(APPEND LINK_LIBRARIES ${QCA2_LIBRARIES} )
ENDIF(QCA2_FOUND) ENDIF(QCA2_FOUND)