mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-27 15:50:40 +02:00
Code Issues Releases Wiki Activity

Find TH account dir if available, and compile websocketpp

Browse Source
This commit is contained in:
Jeff Mitchell
2013-01-17 14:00:05 -05:00
parent b24d5e13cc
commit 6314436492
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@@ -228,6 +228,23 @@ 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)
#set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH})
#set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/accounts/tomahawk/cmake")
#macro_optional_find_package(WebSocketPP)
#macro_log_feature(WEBSOCKETPP_FOUND "WebSocket++ (WebSocketPP)" "Library for using websockets in C++ applications" "https://github.com/zaphoyd/websocketpp/" TRUE "" "")
#include_directories(${WEBSOCKETPP_INCLUDE_DIR})
#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD})
message(STATUS "Tomahawk account directory found, building it")
find_package(Boost COMPONENTS regex thread filesystem random system REQUIRED)
find_package(OpenSSL REQUIRED)
set(TH_ACCOUNT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/accounts/tomahawk")
set(WEBSOCKETPP_INCLUDE_DIR "${TH_ACCOUNT_DIR}/thirdparty/websocketpp/src/include")
set(WEBSOCKETPP_LIBRARY tomahawk_websocketpp)
set(WEBSOCKETPP_LIBRARIES ${WEBSOCKETPP_LIBRARY})
add_subdirectory(${TH_ACCOUNT_DIR}/thirdparty/websocketpp/src)
endif()
#TODO: support external qxt #TODO: support external qxt
set(QXTWEB_FOUND TRUE) set(QXTWEB_FOUND TRUE)
set(QXTWEB_LIBRARIES qxtweb-standalone) set(QXTWEB_LIBRARIES qxtweb-standalone)

6
src/accounts/CMakeLists.txt
View File

@@ -1,8 +1,8 @@
include(TomahawkAddPlugin) include(TomahawkAddPlugin)
file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*") set(SUBDIRECTORIES zeroconf twitter xmpp)
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")
if( JREEN_FOUND ) if( JREEN_FOUND )
add_subdirectory( xmpp ) add_subdirectory( xmpp )