mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-14 10:05:32 +02:00
Code Issues Releases Wiki Activity

find qtkeychain library via CMake

Browse Source
This commit is contained in:
Stefan Derkits
2012-05-22 15:09:12 +02:00
parent ed48f4a5f2
commit 44aa299099
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -120,6 +120,9 @@ macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++
macro_optional_find_package(QCA2) macro_optional_find_package(QCA2)
macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions required for Grooveshark resolver" "http://delta.affinix.com/qca/" FALSE "" "") macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions required for Grooveshark resolver" "http://delta.affinix.com/qca/" FALSE "" "")
macro_optional_find_package(QtKeychain)
macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure password storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
macro_optional_find_package(LibAttica) macro_optional_find_package(LibAttica)
macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" TRUE "" "") macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" TRUE "" "")

13
src/libtomahawk/CMakeLists.txt
View File

@@ -329,6 +329,8 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.
${LIBECHONEST_INCLUDE_DIR}/.. ${LIBECHONEST_INCLUDE_DIR}/..
${CLUCENE_INCLUDE_DIRS} ${CLUCENE_INCLUDE_DIRS}
${PHONON_INCLUDES} ${PHONON_INCLUDES}
${QTKEYCHAIN_INCLUD_DIRS}
${QTKEYCHAIN_INCLUD_DIRS}/..
${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src ${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src
playlist playlist
@@ -372,14 +374,14 @@ ENDIF( UNIX AND NOT APPLE )
IF( WIN32 ) IF( WIN32 )
SET( OS_SPECIFIC_LINK_LIBRARIES SET( OS_SPECIFIC_LINK_LIBRARIES
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
# System # System
"iphlpapi.a" "iphlpapi.a"
"ws2_32.dll" "ws2_32.dll"
"dnsapi.dll" "dnsapi.dll"
"dsound.dll" "dsound.dll"
"winmm.dll" "winmm.dll"
"advapi32.dll" "advapi32.dll"
"shlwapi.dll" "shlwapi.dll"
) )
ENDIF( WIN32 ) ENDIF( WIN32 )
@@ -403,8 +405,8 @@ IF( APPLE )
# System # System
${COREAUDIO_LIBRARY} ${COREAUDIO_LIBRARY}
${COREFOUNDATION_LIBRARY} ${COREFOUNDATION_LIBRARY}
${FOUNDATION_LIBRARY} ${FOUNDATION_LIBRARY}
${SCRIPTINGBRIDGE_LIBRARY} ${SCRIPTINGBRIDGE_LIBRARY}
/System/Library/Frameworks/AppKit.framework /System/Library/Frameworks/AppKit.framework
) )
@@ -452,8 +454,7 @@ TARGET_LINK_LIBRARIES( tomahawklib
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${LINK_LIBRARIES} ${LINK_LIBRARIES}
-L/home/t95012/kde/lib/i386-linux-gnu/ ${QTKEYCHAIN_LIBRARIES}
qtkeychain
) )
INSTALL( TARGETS tomahawklib INSTALL( TARGETS tomahawklib