mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-28 16:20:01 +02:00
Code Issues Releases Wiki Activity

Update in-tree-building TH account stuff

Browse Source
This commit is contained in:
Jeff Mitchell
2013-01-17 15:44:32 -05:00
parent fe4c7543cd
commit bfe59af38b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -200,7 +200,7 @@ macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://develo
include( CheckTagLibFileName ) include( CheckTagLibFileName )
check_taglib_filename( COMPLEX_TAGLIB_FILENAME ) check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
macro_optional_find_package(Boost) find_package(Boost COMPONENTS regex thread filesystem random system date_time REQUIRED)
macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explaination macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explaination
macro_optional_find_package(QCA2) macro_optional_find_package(QCA2)
@@ -233,7 +233,7 @@ IF( WIN32 )
macro_log_feature(QTSPARKLE_FOUND "qtsparkle" "Library for creating auto updaters written in Qt" "https://github.com/davidsansome/qtsparkle" FALSE "" "") macro_log_feature(QTSPARKLE_FOUND "qtsparkle" "Library for creating auto updaters written in Qt" "https://github.com/davidsansome/qtsparkle" FALSE "" "")
ENDIF( WIN32 ) ENDIF( WIN32 )
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/accounts/tomahawk/CMakeLists.tomahawk) if(EXISTS ${CMAKE_SOURCE_DIR}/src/accounts/tomahawk/CMakeLists.txt)
#set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH}) #set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH})
#set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/accounts/tomahawk/cmake") #set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/accounts/tomahawk/cmake")
#macro_optional_find_package(WebSocketPP) #macro_optional_find_package(WebSocketPP)
@@ -241,10 +241,9 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/accounts/tomahawk/CMakeLists.tomahawk)
#include_directories(${WEBSOCKETPP_INCLUDE_DIR}) #include_directories(${WEBSOCKETPP_INCLUDE_DIR})
#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD}) #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD})
message(STATUS "Tomahawk account directory found, building it") message(STATUS "Tomahawk account directory found, building it")
find_package(Boost COMPONENTS regex thread filesystem random system REQUIRED)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
set(TH_ACCOUNT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/accounts/tomahawk") set(TH_ACCOUNT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/accounts/tomahawk")
set(WEBSOCKETPP_INCLUDE_DIR "${TH_ACCOUNT_DIR}/thirdparty/websocketpp/src/include") set(WEBSOCKETPP_INCLUDE_DIR "${CMAKE_BINARY_DIR}/src/accounts/tomahawk/thirdparty/websocketpp/src/include")
set(WEBSOCKETPP_LIBRARY tomahawk_websocketpp) set(WEBSOCKETPP_LIBRARY tomahawk_websocketpp)
set(WEBSOCKETPP_LIBRARIES ${WEBSOCKETPP_LIBRARY}) set(WEBSOCKETPP_LIBRARIES ${WEBSOCKETPP_LIBRARY})
add_subdirectory(${TH_ACCOUNT_DIR}/thirdparty/websocketpp/src) add_subdirectory(${TH_ACCOUNT_DIR}/thirdparty/websocketpp/src)

2
src/accounts/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
include(TomahawkAddPlugin) include(TomahawkAddPlugin)
set(SUBDIRECTORIES zeroconf twitter xmpp) file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
foreach(SUBDIRECTORY ${SUBDIRECTORIES}) foreach(SUBDIRECTORY ${SUBDIRECTORIES})
if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt") if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt")
if(SUBDIRECTORY STREQUAL "xmpp") if(SUBDIRECTORY STREQUAL "xmpp")