From 63144364921312da501cea93a4b961093dd24907 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Thu, 17 Jan 2013 14:00:05 -0500 Subject: [PATCH] Find TH account dir if available, and compile websocketpp --- CMakeLists.txt | 17 +++++++++++++++++ src/accounts/CMakeLists.txt | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 81f0cd3c8..a92bc2a63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 "" "") 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 set(QXTWEB_FOUND TRUE) set(QXTWEB_LIBRARIES qxtweb-standalone) diff --git a/src/accounts/CMakeLists.txt b/src/accounts/CMakeLists.txt index c73762cf2..a7a301461 100644 --- a/src/accounts/CMakeLists.txt +++ b/src/accounts/CMakeLists.txt @@ -1,8 +1,8 @@ include(TomahawkAddPlugin) -file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*") -foreach( SUBDIRECTORY ${SUBDIRECTORIES}) - if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" ) +set(SUBDIRECTORIES zeroconf twitter xmpp) +foreach(SUBDIRECTORY ${SUBDIRECTORIES}) + if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt") if(SUBDIRECTORY STREQUAL "xmpp") if( JREEN_FOUND ) add_subdirectory( xmpp )