Browse Source

fix code-style in CMakeLists.txt:

- use tabs for indention
- use lower-case commands
- fix superfluous newlines at end of files
master
Steffen Vogel 4 years ago committed by vitalyster
parent
commit
36753323f9
  1. 210
      CMakeLists.txt
  2. 26
      backends/CMakeLists.txt
  3. 9
      backends/frotz/CMakeLists.txt
  4. 6
      backends/frotz/dfrotz/CMakeLists.txt
  5. 19
      backends/libcommuni/CMakeLists.txt
  6. 16
      backends/libpurple/CMakeLists.txt
  7. 7
      backends/smstools3/CMakeLists.txt
  8. 13
      backends/swiften/CMakeLists.txt
  9. 21
      backends/template/CMakeLists.txt
  10. 16
      backends/twitter/CMakeLists.txt
  11. 2
      backends/twitter/libtwitcurl/CMakeLists.txt
  12. 4
      docs/CMakeLists.txt
  13. 57
      docs/guide/CMakeLists.txt
  14. 2
      include/CMakeLists.txt
  15. 20
      include/transport/CMakeLists.txt
  16. 72
      libtransport/CMakeLists.txt
  17. 4
      plugin/CMakeLists.txt
  18. 38
      plugin/cpp/CMakeLists.txt
  19. 20
      plugin/python/CMakeLists.txt
  20. 2
      spectrum/CMakeLists.txt
  21. 51
      spectrum/src/CMakeLists.txt
  22. 4
      spectrum/src/frontends/CMakeLists.txt
  23. 31
      spectrum/src/frontends/slack/CMakeLists.txt
  24. 27
      spectrum/src/frontends/xmpp/CMakeLists.txt
  25. 2
      spectrum_manager/CMakeLists.txt
  26. 37
      spectrum_manager/src/CMakeLists.txt
  27. 17
      tests/CMakeLists.txt
  28. 11
      tests/libpurple/CMakeLists.txt
  29. 33
      tests/libtransport/CMakeLists.txt

210
CMakeLists.txt

@ -1,8 +1,11 @@ @@ -1,8 +1,11 @@
cmake_minimum_required(VERSION 2.6)
project(libtransport)
if(${CMAKE_MAJOR_VERSION} GREATER 2)
cmake_policy(SET CMP0037 OLD)
cmake_policy(SET CMP0037 OLD)
endif()
include(CPack)
message(STATUS "Variables to override default places where to find libraries:")
message(STATUS "|- cppunit : -DCPPUNIT_INCLUDE_DIR, -DCPPUNIT_LIBRARY")
@ -35,41 +38,41 @@ option(ENABLE_DOCS "Build Docs" ON) @@ -35,41 +38,41 @@ option(ENABLE_DOCS "Build Docs" ON)
# option(ENABLE_LOG "Build with logging using Log4cxx" ON)
option(ENABLE_TESTS "Build Tests using CppUnit" OFF)
MACRO(LIST_CONTAINS var value)
SET(${var})
FOREACH (value2 ${ARGN})
IF (${value} STREQUAL ${value2})
SET(${var} TRUE)
ENDIF (${value} STREQUAL ${value2})
ENDFOREACH (value2)
ENDMACRO(LIST_CONTAINS)
if(NOT LIB_INSTALL_DIR)
set(LIB_INSTALL_DIR "lib")
macro(LIST_CONTAINS var value)
set(${var})
foreach(value2 ${ARGN})
if(${value} STREQUAL ${value2})
set(${var} TRUE)
endif(${value} STREQUAL ${value2})
endforeach(value2)
endmacro(LIST_CONTAINS)
if(NOT LIB_install_DIR)
set(LIB_install_DIR "lib")
endif()
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules")
###### Prerequisites ######
# FIND SWIFTEN
find_package(Swiften)
if(NOT SWIFTEN_FOUND)
if (ZLIB_LIBRARY)
if(ZLIB_LIBRARY)
set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${ZLIB_LIBRARY})
endif()
if (EXPAT_LIBRARY)
if(EXPAT_LIBRARY)
set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${EXPAT_LIBRARY})
endif()
if (LIBIDN_LIBRARY)
if(LIBIDN_LIBRARY)
set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${LIBIDN_LIBRARY})
endif()
if (LIBXML_LIBRARY)
if(LIBXML_LIBRARY)
set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${LIBXML_LIBRARY})
endif()
set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Dnsapi")
set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Crypt32")
set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Secur32")
@ -80,15 +83,16 @@ if(NOT SWIFTEN_FOUND) @@ -80,15 +83,16 @@ if(NOT SWIFTEN_FOUND)
endif()
# FIND BOOST
if (WIN32)
if(WIN32)
set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF)
add_definitions(-DBOOST_ALL_DYN_LINK)
add_definitions(-DBOOST_ALL_NO_LIB)
endif(WIN32)
set(Boost_FIND_QUIETLY ON)
if ("${SWIFTEN_VERSION}" STRGREATER "4")
set(Boost_FIND_QUIETLY ON)
if("${SWIFTEN_VERSION}" STRGREATER "4")
find_package(Boost COMPONENTS program_options date_time system filesystem regex thread locale REQUIRED)
else()
find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals locale REQUIRED)
@ -96,20 +100,20 @@ endif() @@ -96,20 +100,20 @@ endif()
message( STATUS "Found Boost: ${Boost_VERSION}, ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
if (${Boost_VERSION} GREATER 104999)
if(${Boost_VERSION} GREATER 104999)
message( STATUS "Using BOOST_FILESYSTEM_VERSION=3")
add_definitions(-DBOOST_FILESYSTEM_VERSION=3)
endif()
# FIND POPT
if (NOT WIN32)
if(NOT WIN32)
find_package(popt REQUIRED)
endif()
###### Database ######
# FIND SQLITE3
if (ENABLE_SQLITE3)
if(ENABLE_SQLITE3)
find_package(sqlite3)
endif()
@ -129,8 +133,8 @@ endif() @@ -129,8 +133,8 @@ endif()
if(ENABLE_PURPLE)
find_package(purple)
if (WIN32)
if (PURPLE_NOT_RUNTIME)
if(WIN32)
if(PURPLE_NOT_RUNTIME)
add_definitions(-DPURPLE_RUNTIME=0)
else(PURPLE_NOT_RUNTIME)
add_definitions(-DPURPLE_RUNTIME=1)
@ -145,7 +149,7 @@ endif() @@ -145,7 +149,7 @@ endif()
# FIND GLIB
if(ENABLE_PURPLE)
# if (GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
# if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
# set(GLIB2_FOUND TRUE)
# else()
find_package(glib)
@ -158,10 +162,10 @@ endif() @@ -158,10 +162,10 @@ endif()
# FIND PROTOBUF
find_package(Protobuf REQUIRED)
if (NOT PROTOBUF_FOUND AND PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY)
if(NOT PROTOBUF_FOUND AND PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY)
set(PROTOBUF_FOUND 1)
set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR})
if (PROTOBUF_PROTOC_EXECUTABLE)
if(PROTOBUF_PROTOC_EXECUTABLE)
else()
set(PROTOBUF_PROTOC_EXECUTABLE protoc)
endif()
@ -169,43 +173,41 @@ if (NOT PROTOBUF_FOUND AND PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY) @@ -169,43 +173,41 @@ if (NOT PROTOBUF_FOUND AND PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY)
endif()
find_package(jsoncpp REQUIRED)
if (JSONCPP_FOUND)
include_directories(${JSONCPP_INCLUDE_DIRS})
message(STATUS "Found jsoncpp: ${JSONCPP_INCLUDE_DIRS} ${JSONCPP_LIBRARY}, shared: ${JSONCPP_LIBRARY_IS_SHARED}")
if(JSONCPP_FOUND)
include_directories(${JSONCPP_INCLUDE_DIRS})
message(STATUS "Found jsoncpp: ${JSONCPP_INCLUDE_DIRS} ${JSONCPP_LIBRARY}, shared: ${JSONCPP_LIBRARY_IS_SHARED}")
endif()
if (WIN32)
if(WIN32)
add_definitions(-DSWIFTEN_STATIC=1)
ADD_DEFINITIONS(-D_WIN32_WINNT=0x0600)
ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
ADD_DEFINITIONS(-DBOOST_USE_WINDOWS_H)
ADD_DEFINITIONS(-D_UNICODE)
ADD_DEFINITIONS(-DUNICODE)
add_definitions(-D_WIN32_WINNT=0x0600)
add_definitions(-DWIN32_LEAN_AND_MEAN)
add_definitions(-DBOOST_USE_WINDOWS_H)
add_definitions(-D_UNICODE)
add_definitions(-DUNICODE)
endif()
if (CMAKE_COMPILER_IS_GNUCXX)
find_package(openssl)
if(CMAKE_COMPILER_IS_GNUCXX)
find_package(openssl)
endif()
if(ENABLE_IRC)
find_package(Communi)
if(ENABLE_QT4)
INCLUDE(FindQt4)
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork)
include(FindQt4)
find_package(Qt4 COMPONENTS QtCore QtNetwork)
else()
FIND_PACKAGE(Qt5 COMPONENTS Core Network)
find_package(Qt5 COMPONENTS Core Network)
endif()
# ADD_DEFINITIONS(${SWIFTEN_CFLAGS})
ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS)
# ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
# add_definitions(${SWIFTEN_CFLAGS})
add_definitions(-DSUPPORT_LEGACY_CAPS)
# add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
endif()
find_package(event)
####### Miscallanous ######
if(ENABLE_DOCS)
@ -237,11 +239,11 @@ endif() @@ -237,11 +239,11 @@ endif()
message(" Supported features")
message("-----------------------")
if (SPECTRUM_VERSION)
ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
else (SPECTRUM_VERSION)
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
if (NOT GIT_EXECUTABLE)
if(SPECTRUM_VERSION)
add_definitions(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
else(SPECTRUM_VERSION)
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
if(NOT GIT_EXECUTABLE)
set (GIT_EXECUTABLE git)
endif()
execute_process(COMMAND ${GIT_EXECUTABLE} "--git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git" rev-parse --short HEAD
@ -249,51 +251,51 @@ else (SPECTRUM_VERSION) @@ -249,51 +251,51 @@ else (SPECTRUM_VERSION)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set(SPECTRUM_VERSION 2.0.x-git-${GIT_REVISION})
ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
else (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
add_definitions(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
else(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
set(SPECTRUM_VERSION 2.0.10)
ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
endif (SPECTRUM_VERSION)
add_definitions(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
endif(SPECTRUM_VERSION)
message("Version : " ${SPECTRUM_VERSION})
if (SQLITE3_FOUND)
ADD_DEFINITIONS(-DWITH_SQLITE)
if (WIN32)
if(SQLITE3_FOUND)
add_definitions(-DWITH_SQLITE)
if(WIN32)
include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
message("SQLite3 : bundled")
else (WIN32)
else(WIN32)
include_directories(${SQLITE3_INCLUDE_DIR})
message("SQLite3 : yes")
endif (WIN32)
else (SQLITE3_FOUND)
endif(WIN32)
else(SQLITE3_FOUND)
set(SQLITE3_LIBRARIES "")
if(ENABLE_SQLITE3)
message("SQLite3 : no (install sqlite3)")
else(ENABLE_SQLITE3)
message("SQLite3 : no (user disabled)")
endif()
endif (SQLITE3_FOUND)
endif(SQLITE3_FOUND)
if (MYSQL_FOUND)
ADD_DEFINITIONS(-DWITH_MYSQL)
if(MYSQL_FOUND)
add_definitions(-DWITH_MYSQL)
include_directories(${MYSQL_INCLUDE_DIR})
message("MySQL : yes")
else (MYSQL_FOUND)
else(MYSQL_FOUND)
set(MYSQL_LIBRARIES "")
if(ENABLE_MYSQL)
message("MySQL : no (install mysql-devel)")
else(ENABLE_MYSQL)
message("MySQL : no (user disabled)")
endif()
endif (MYSQL_FOUND)
endif(MYSQL_FOUND)
if (PQXX_FOUND)
ADD_DEFINITIONS(-DWITH_PQXX)
if(PQXX_FOUND)
add_definitions(-DWITH_PQXX)
include_directories(${PQXX_INCLUDE_DIR})
message("PostgreSQL : yes")
else (PQXX_FOUND)
else(PQXX_FOUND)
set(PQXX_LIBRARY "")
set(PQ_LIBRARY "")
if(ENABLE_PQXX)
@ -301,10 +303,10 @@ else (PQXX_FOUND) @@ -301,10 +303,10 @@ else (PQXX_FOUND)
else(ENABLE_PQXX)
message("PostgreSQL : no (user disabled)")
endif()
endif (PQXX_FOUND)
endif(PQXX_FOUND)
if (PROTOBUF_FOUND)
ADD_DEFINITIONS(-DWITH_PROTOBUF)
if(PROTOBUF_FOUND)
add_definitions(-DWITH_PROTOBUF)
include_directories(${PROTOBUF_INCLUDE_DIRS})
message("Network plugins : yes")
@ -320,8 +322,8 @@ if (PROTOBUF_FOUND) @@ -320,8 +322,8 @@ if (PROTOBUF_FOUND)
endif()
endif()
if (HAVE_EVENT)
ADD_DEFINITIONS(-DWITH_LIBEVENT)
if(HAVE_EVENT)
add_definitions(-DWITH_LIBEVENT)
include_directories(${EVENT_INCLUDE_DIRS})
message(" libev eventloop : yes")
else()
@ -331,12 +333,12 @@ if (PROTOBUF_FOUND) @@ -331,12 +333,12 @@ if (PROTOBUF_FOUND)
endif()
if(IRC_FOUND)
ADD_DEFINITIONS(-DIRC_SHARED)
add_definitions(-DIRC_SHARED)
message("IRC plugin : yes")
include_directories(${QT_QTNETWORK_INCLUDE_DIR})
include_directories(${IRC_INCLUDE_DIR})
if (ENABLE_QT4)
if(ENABLE_QT4)
include(${QT_USE_FILE})
endif()
else()
@ -351,7 +353,7 @@ if (PROTOBUF_FOUND) @@ -351,7 +353,7 @@ if (PROTOBUF_FOUND)
else(ENABLE_TWITTER)
message("Twitter plugin : no (user disabled)")
endif()
if (NOT WIN32)
if(NOT WIN32)
if(ENABLE_FROTZ)
message("Frotz plugin : yes")
else()
@ -380,63 +382,61 @@ else() @@ -380,63 +382,61 @@ else()
message("Frotz plugin : no (install libprotobuf-dev)")
message("SMSTools3 plugin : no (install libprotobuf-dev)")
message("Swiften plugin : no (install libprotobuf-dev)")
message("Twitter plugin : no (install libprotobuf-dev)")
message("Twitter plugin : no (install libprotobuf-dev)")
endif()
if (LOG4CXX_FOUND)
if(LOG4CXX_FOUND)
message("Log4cxx : yes")
include_directories(${LOG4CXX_INCLUDE_DIR})
ADD_DEFINITIONS(-DWITH_LOG4CXX)
add_definitions(-DWITH_LOG4CXX)
else()
set(LOG4CXX_LIBRARIES "")
if (WIN32)
if(WIN32)
message("Log4cxx : no (install log4cxx-devel)")
else()
message(FATAL_ERROR "Log4cxx : no (install log4cxx-devel)")
endif()
endif()
if (WIN32)
ADD_DEFINITIONS(-DLOG4CXX_STATIC)
if(WIN32)
add_definitions(-DLOG4CXX_STATIC)
endif()
if(CMAKE_BUILD_TYPE MATCHES Debug)
if (CMAKE_COMPILER_IS_GNUCXX)
ADD_DEFINITIONS(-O0)
ADD_DEFINITIONS(-ggdb)
if(CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-O0)
add_definitions(-ggdb)
endif()
ADD_DEFINITIONS(-DDEBUG)
add_definitions(-DDEBUG)
message("Debug : yes")
else(CMAKE_BUILD_TYPE MATCHES Debug)
message("Debug : no (run \"cmake . -DCMAKE_BUILD_TYPE=Debug\")")
endif(CMAKE_BUILD_TYPE MATCHES Debug)
SET(TRANSPORT_VERSION 2.0)
SET(PROJECT_VERSION 2.0)
set(TRANSPORT_VERSION 2.0)
set(PROJECT_VERSION 2.0)
include_directories(include)
include_directories(${EVENT_INCLUDE_DIRS})
include_directories(${SWIFTEN_INCLUDE_DIR})
include_directories(${Boost_INCLUDE_DIRS})
if (CMAKE_COMPILER_IS_GNUCXX)
if(CMAKE_COMPILER_IS_GNUCXX)
include_directories(${OPENSSL_INCLUDE_DIR})
endif()
ADD_SUBDIRECTORY(libtransport)
ADD_SUBDIRECTORY(plugin)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(spectrum)
ADD_SUBDIRECTORY(backends)
ADD_SUBDIRECTORY(tests)
if (NOT WIN32)
ADD_SUBDIRECTORY(spectrum_manager)
# ADD_SUBDIRECTORY(spectrum2_send_message)
add_subdirectory(libtransport)
add_subdirectory(plugin)
add_subdirectory(include)
add_subdirectory(spectrum)
add_subdirectory(backends)
add_subdirectory(tests)
if(NOT WIN32)
add_subdirectory(spectrum_manager)
# add_subdirectory(spectrum2_send_message)
endif()
if (CPPUNIT_FOUND)
if(CPPUNIT_FOUND)
message("Tests : yes")
include_directories(${CPPUNIT_INCLUDE_DIR})
else()
@ -449,7 +449,7 @@ endif() @@ -449,7 +449,7 @@ endif()
if(DOXYGEN_FOUND)
message("Documentation : yes")
ADD_SUBDIRECTORY(docs)
add_subdirectory(docs)
else(DOXYGEN_FOUND)
if(ENABLE_DOCS)
message("Documentation : no (install doxygen)")

26
backends/CMakeLists.txt

@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
if (PROTOBUF_FOUND)
if (PURPLE_FOUND)
ADD_SUBDIRECTORY(libpurple)
if(PROTOBUF_FOUND)
add_subdirectory(template)
if(PURPLE_FOUND)
add_subdirectory(libpurple)
endif()
if (IRC_FOUND)
ADD_SUBDIRECTORY(libcommuni)
if(IRC_FOUND)
add_subdirectory(libcommuni)
endif()
if (ENABLE_XMPP)
ADD_SUBDIRECTORY(swiften)
if(ENABLE_XMPP)
add_subdirectory(swiften)
endif()
ADD_SUBDIRECTORY(template)
if(ENABLE_TWITTER)
ADD_SUBDIRECTORY(twitter)
add_subdirectory(twitter)
endif()
if (NOT WIN32)
if(NOT WIN32)
if(ENABLE_SMSTOOLS3)
ADD_SUBDIRECTORY(smstools3)
add_subdirectory(smstools3)
endif()
if(ENABLE_FROTZ)
ADD_SUBDIRECTORY(frotz)
add_subdirectory(frotz)
endif()
endif()
endif()

9
backends/frotz/CMakeLists.txt

@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
cmake_minimum_required(VERSION 2.6)
ADD_SUBDIRECTORY(dfrotz)
add_subdirectory(dfrotz)
FILE(GLOB SRC *.c *.cpp)
file(GLOB SRC *.c *.cpp)
ADD_EXECUTABLE(spectrum2_frotz_backend ${SRC})
add_executable(spectrum2_frotz_backend ${SRC})
target_link_libraries(spectrum2_frotz_backend transport pthread ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
INSTALL(TARGETS spectrum2_frotz_backend RUNTIME DESTINATION bin)
install(TARGETS spectrum2_frotz_backend RUNTIME DESTINATION bin)

6
backends/frotz/dfrotz/CMakeLists.txt

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC common/*.c dumb/*.c)
file(GLOB SRC common/*.c dumb/*.c)
ADD_EXECUTABLE(dfrotz ${SRC})
add_executable(dfrotz ${SRC})
# target_link_libraries(dfrotz)
INSTALL(TARGETS dfrotz RUNTIME DESTINATION bin)
install(TARGETS dfrotz RUNTIME DESTINATION bin)

19
backends/libcommuni/CMakeLists.txt

@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp)
FILE(GLOB HEADERS *.h)
if (ENABLE_QT4)
file(GLOB SRC *.cpp)
file(GLOB HEADERS *.h)
if(ENABLE_QT4)
QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
else()
QT5_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
@ -10,20 +11,20 @@ else() @@ -10,20 +11,20 @@ else()
endif()
add_definitions(-DQT_NO_KEYWORDS)
ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC})
add_executable(spectrum2_libcommuni_backend ${SRC})
if (NOT WIN32)
if (ENABLE_QT4)
if(NOT WIN32)
if(ENABLE_QT4)
target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport pthread)
else()
target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport pthread)
endif()
else ()
if (ENABLE_QT4)
else()
if(ENABLE_QT4)
target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport)
else()
target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport)
endif()
endif()
INSTALL(TARGETS spectrum2_libcommuni_backend RUNTIME DESTINATION bin)
install(TARGETS spectrum2_libcommuni_backend RUNTIME DESTINATION bin)

16
backends/libpurple/CMakeLists.txt

@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp)
ADD_EXECUTABLE(spectrum2_libpurple_backend ${SRC})
file(GLOB SRC *.cpp)
add_executable(spectrum2_libpurple_backend ${SRC})
if(MSVC)
target_link_libraries(spectrum2_libpurple_backend transport ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARIES} ${EVENT_LIBRARIES} transport-plugin ${PROTOBUF_LIBRARY})
target_link_libraries(spectrum2_libpurple_backend transport ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARIES} ${EVENT_LIBRARIES} transport-plugin ${PROTOBUF_LIBRARY})
else()
if (NOT WIN32)
target_link_libraries(spectrum2_libpurple_backend transport ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport-plugin pthread)
if(NOT WIN32)
target_link_libraries(spectrum2_libpurple_backend transport ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport-plugin pthread)
else()
target_link_libraries(spectrum2_libpurple_backend transport ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport-plugin)
target_link_libraries(spectrum2_libpurple_backend transport ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport-plugin)
endif()
endif()
INSTALL(TARGETS spectrum2_libpurple_backend RUNTIME DESTINATION bin)
install(TARGETS spectrum2_libpurple_backend RUNTIME DESTINATION bin)

7
backends/smstools3/CMakeLists.txt

@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.c *.cpp)
file(GLOB SRC *.c *.cpp)
ADD_EXECUTABLE(spectrum2_smstools3_backend ${SRC})
add_executable(spectrum2_smstools3_backend ${SRC})
target_link_libraries(spectrum2_smstools3_backend transport pthread ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
INSTALL(TARGETS spectrum2_smstools3_backend RUNTIME DESTINATION bin)
install(TARGETS spectrum2_smstools3_backend RUNTIME DESTINATION bin)

13
backends/swiften/CMakeLists.txt

@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp)
file(GLOB SRC *.cpp)
ADD_EXECUTABLE(spectrum2_swiften_backend ${SRC})
add_executable(spectrum2_swiften_backend ${SRC})
IF (NOT WIN32)
target_link_libraries(spectrum2_swiften_backend transport pthread ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
if(NOT WIN32)
target_link_libraries(spectrum2_swiften_backend transport pthread ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
else()
target_link_libraries(spectrum2_swiften_backend transport ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
target_link_libraries(spectrum2_swiften_backend transport ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
endif()
INSTALL(TARGETS spectrum2_swiften_backend RUNTIME DESTINATION bin)
install(TARGETS spectrum2_swiften_backend RUNTIME DESTINATION bin)

21
backends/template/CMakeLists.txt

@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.c *.cpp)
file(GLOB SRC *.c *.cpp)
ADD_EXECUTABLE(spectrum2_template_backend ${SRC})
add_executable(spectrum2_template_backend ${SRC})
if (CMAKE_COMPILER_IS_GNUCXX)
if (NOT WIN32)
target_link_libraries(spectrum2_template_backend transport pthread ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
if(CMAKE_COMPILER_IS_GNUCXX)
if(NOT WIN32)
target_link_libraries(spectrum2_template_backend transport pthread ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
else()
target_link_libraries(spectrum2_template_backend transport ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
endif()
else()
target_link_libraries(spectrum2_template_backend transport ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
target_link_libraries(spectrum2_template_backend transport ${PROTOBUF_LIBRARY} ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
endif()
else()
target_link_libraries(spectrum2_template_backend transport ${PROTOBUF_LIBRARY} ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
endif()
#INSTALL(TARGETS spectrum2_template_backend RUNTIME DESTINATION bin)
#install(TARGETS spectrum2_template_backend RUNTIME DESTINATION bin)

16
backends/twitter/CMakeLists.txt

@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
include_directories (${libtransport_SOURCE_DIR}/backends/twitter/libtwitcurl)
FILE(GLOB SRC *.cpp libtwitcurl/*.cpp Requests/*.cpp)
include_directories(${libtransport_SOURCE_DIR}/backends/twitter/libtwitcurl)
file(GLOB SRC *.cpp libtwitcurl/*.cpp Requests/*.cpp)
add_executable(spectrum2_twitter_backend ${SRC})
find_package(CURL)
if(CURL_FOUND)
message(STATUS "Using curl ${CURL_VERSION_STRING}: ${CURL_INCLUDE_DIRS} ${CURL_LIBRARIES}")
include_directories (${CURL_INCLUDE_DIRS} ${JSONCPP_INCLUDE_DIRS})
target_link_libraries(spectrum2_twitter_backend transport ${CURL_LIBRARIES} ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
message(STATUS "Using curl ${CURL_VERSION_STRING}: ${CURL_INCLUDE_DIRS} ${CURL_LIBRARIES}")
include_directories (${CURL_INCLUDE_DIRS} ${JSONCPP_INCLUDE_DIRS})
target_link_libraries(spectrum2_twitter_backend transport ${CURL_LIBRARIES} ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
else()
message(FATAL_ERROR "curl not found")
message(FATAL_ERROR "curl not found")
endif()
INSTALL(TARGETS spectrum2_twitter_backend RUNTIME DESTINATION bin)
install(TARGETS spectrum2_twitter_backend RUNTIME DESTINATION bin)

2
backends/twitter/libtwitcurl/CMakeLists.txt

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
set(twitSrcs base64.cpp HMAC_SHA1.cpp oauthlib.cpp SHA1.cpp urlencode.cpp twitcurl.cpp)
FIND_PACKAGE(PkgConfig)
find_package(PkgConfig)
include_directories (${PKGS_INCLUDE_DIRS})
add_library(twitcurl STATIC ${twitSrcs})

4
docs/CMakeLists.txt

@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
ADD_SUBDIRECTORY(api)
ADD_SUBDIRECTORY(guide)
add_subdirectory(api)
add_subdirectory(guide)

57
docs/guide/CMakeLists.txt

@ -1,46 +1,43 @@ @@ -1,46 +1,43 @@
cmake_minimum_required(VERSION 2.4)
macro(ADD_TEXTILE SRC TITLE)
STRING(REGEX REPLACE ".textile\$" "" outfileName "${SRC}")
SET(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfileName}.html")
macro(add_textile SRC TITLE)
string(REGEX REPLACE ".textile\$" "" outfileName "${SRC}")
set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfileName}.html")
# Custom command to do the processing
if(${ARGN})
ADD_CUSTOM_COMMAND(OUTPUT "${outfile}"
add_custom_command(OUTPUT "${outfile}"
COMMAND pandoc -o "${outfile}" "${SRC}" -f textile -t html -s --base-header-level=2 --template=${CMAKE_CURRENT_SOURCE_DIR}/template.html -T "${TITLE}"
DEPENDS "${SRC}")
else()
ADD_CUSTOM_COMMAND(OUTPUT "${outfile}"
add_custom_command(OUTPUT "${outfile}"
COMMAND pandoc -o "${outfile}" "${SRC}" -f textile -t html -s --toc --base-header-level=2 --template=${CMAKE_CURRENT_SOURCE_DIR}/template.html -T "${TITLE}"
DEPENDS "${SRC}")
endif()
# Finally remember the output file for dependencies
SET(outFiles ${outFiles} "${outfile}")
set(outFiles ${outFiles} "${outfile}")
endmacro()
ADD_TEXTILE("index.textile" "Spectrum 2 documentation" 1)
ADD_TEXTILE("about.textile" "Spectrum 2 - What is Spectrum 2?")
ADD_TEXTILE("configure_xmpp_server.textile" "Spectrum 2 - Configure XMPP server")
ADD_TEXTILE("tutorial_gateway_mode.textile" "Spectrum 2 - Spectrum 2 in gateway mode")
ADD_TEXTILE("config_file.textile" "Spectrum 2 - Config File")
ADD_TEXTILE("server_ssl.textile" "Spectrum 2 - Server mode SSL support")
ADD_TEXTILE("mysql.textile" "Spectrum 2 - MySQL Support")
ADD_TEXTILE("postgresql.textile" "Spectrum 2 - PostgreSQL Support")
ADD_TEXTILE("logging.textile" "Spectrum 2 - Logging")
ADD_TEXTILE("backends.textile" "Spectrum 2 - Backends overview")
ADD_TEXTILE("libpurple.textile" "Spectrum 2 - Libpurple backend")
ADD_TEXTILE("libcommuni.textile" "Spectrum 2 - Libcommuni backend")
ADD_TEXTILE("swiften.textile" "Spectrum 2 - Swiften backend")
ADD_TEXTILE("spectrum2_manager.textile" "Spectrum 2 - spectrum2_manager tool")
ADD_TEXTILE("twitter.textile" "Spectrum 2 - Twitter backend")
ADD_TEXTILE("getting_backtrace.textile" "Spectrum 2 - Getting a backtrace")
ADD_TEXTILE("munin.textile" "Spectrum 2 - Munin integration")
ADD_TEXTILE("developer_arch.textile" "Spectrum 2 - Architecture")
ADD_TEXTILE("developer_lowlevel.textile" "Spectrum 2 - Low level backend creation")
add_textile("index.textile" "Spectrum 2 documentation" 1)
add_textile("about.textile" "Spectrum 2 - What is Spectrum 2?")
add_textile("configure_xmpp_server.textile" "Spectrum 2 - Configure XMPP server")
add_textile("tutorial_gateway_mode.textile" "Spectrum 2 - Spectrum 2 in gateway mode")
add_textile("config_file.textile" "Spectrum 2 - Config File")
add_textile("server_ssl.textile" "Spectrum 2 - Server mode SSL support")
add_textile("mysql.textile" "Spectrum 2 - MySQL Support")
add_textile("postgresql.textile" "Spectrum 2 - PostgreSQL Support")
add_textile("logging.textile" "Spectrum 2 - Logging")
add_textile("backends.textile" "Spectrum 2 - Backends overview")
add_textile("libpurple.textile" "Spectrum 2 - Libpurple backend")
add_textile("libcommuni.textile" "Spectrum 2 - Libcommuni backend")
add_textile("swiften.textile" "Spectrum 2 - Swiften backend")
add_textile("spectrum2_manager.textile" "Spectrum 2 - spectrum2_manager tool")
add_textile("twitter.textile" "Spectrum 2 - Twitter backend")
add_textile("getting_backtrace.textile" "Spectrum 2 - Getting a backtrace")
add_textile("munin.textile" "Spectrum 2 - Munin integration")
add_textile("developer_arch.textile" "Spectrum 2 - Architecture")
add_textile("developer_lowlevel.textile" "Spectrum 2 - Low level backend creation")
# Setup a target to drive the conversion
ADD_CUSTOM_TARGET(guide DEPENDS ${outFiles})
add_custom_target(guide DEPENDS ${outFiles})

2
include/CMakeLists.txt

@ -1 +1 @@ @@ -1 +1 @@
ADD_SUBDIRECTORY(transport)
add_subdirectory(transport)

20
include/transport/CMakeLists.txt

@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
if (PROTOBUF_FOUND)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/protocol.pb.cc ${CMAKE_CURRENT_SOURCE_DIR}/protocol.pb.h
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --cpp_out ${CMAKE_CURRENT_SOURCE_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/protocol.proto
COMMENT "Running C++ protocol buffer compiler on protocol.proto"
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/protocol.proto
)
ADD_CUSTOM_TARGET(pb DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/protocol.pb.cc)
if(PROTOBUF_FOUND)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/protocol.pb.cc ${CMAKE_CURRENT_SOURCE_DIR}/protocol.pb.h
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --cpp_out ${CMAKE_CURRENT_SOURCE_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/protocol.proto
COMMENT "Running C++ protocol buffer compiler on protocol.proto"
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/protocol.proto
)
add_custom_target(pb DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/protocol.pb.cc)
endif()
FILE(GLOB HEADERS *.h protocol.h)
file(GLOB HEADERS *.h protocol.h)
INSTALL(FILES ${HEADERS} DESTINATION include/transport COMPONENT headers)
install(FILES ${HEADERS} DESTINATION include/transport COMPONENT headers)

72
libtransport/CMakeLists.txt

@ -1,66 +1,66 @@ @@ -1,66 +1,66 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB_RECURSE SWIFTEN_SRC ../include/Swiften/*.cpp)
file(GLOB SRC *.cpp *.h)
file(GLOB_RECURSE SWIFTEN_SRC ../include/Swiften/*.cpp)
# Build without openssl on msvc
if (NOT MSVC)
if (APPLE)
string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
else()
string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
endif()
if(NOT MSVC)
if(APPLE)
string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
else()
string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
endif()
else()
string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
endif()
FILE(GLOB HEADERS ../include/transport/*.h)
file(GLOB HEADERS ../include/transport/*.h)
include_directories(../spectrum/src/frontends/xmpp/)
if (NOT WIN32)
include_directories(${POPT_INCLUDE_DIR})
if(NOT WIN32)
include_directories(${POPT_INCLUDE_DIR})
endif()
# SOURCE_GROUP(headers FILES ${HEADERS})
#source_group(headers FILES ${HEADERS})
if (PROTOBUF_FOUND)
if (NOT WIN32)
ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
if(PROTOBUF_FOUND)
if(NOT WIN32)
add_library(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
else()
ADD_LIBRARY(transport STATIC ${HEADERS} ${SRC} ${SWIFTEN_SRC})
add_library(transport STATIC ${HEADERS} ${SRC} ${SWIFTEN_SRC})
endif()
# SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
ADD_DEPENDENCIES(transport pb)
# set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
add_dependencies(transport pb)
else(PROTOBUF_FOUND)
ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
add_library(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
endif(PROTOBUF_FOUND)
# if (CMAKE_COMPILER_IS_GNUCXX)
if (NOT WIN32)
ADD_DEFINITIONS(-fPIC)
# if(CMAKE_COMPILER_IS_GNUCXX)
if(NOT WIN32)
add_definitions(-fPIC)
endif()
# endif()
find_package(CURL)
if (WIN32)
if(WIN32)
include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.lib)
target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.lib)
else()
TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY})
target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY})
endif()
SET_TARGET_PROPERTIES(transport PROPERTIES
VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
set_target_properties(transport PROPERTIES
VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
)
if (APPLE)
TARGET_LINK_LIBRARIES(transport ${APPLE_FRAMEWORKS})
if(APPLE)
target_link_libraries(transport ${APPLE_FRAMEWORKS})
endif()
install(TARGETS transport LIBRARY DESTINATION ${LIB_install_DIR} ARCHIVE DESTINATION ${LIB_install_DIR} COMPONENT libraries)
INSTALL(TARGETS transport LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries)
#CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc")
#INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig)
#configure_file(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc")
#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig)

4
plugin/CMakeLists.txt

@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
ADD_SUBDIRECTORY(cpp)
ADD_SUBDIRECTORY(python)
add_subdirectory(cpp)
add_subdirectory(python)

38
plugin/cpp/CMakeLists.txt

@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB HEADERS ../include/transport/*.h)
file(GLOB SRC *.cpp *.h)
file(GLOB HEADERS ../include/transport/*.h)
set(EXTRA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../libtransport/MemoryUsage.cpp)
set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../libtransport/Logging.cpp)
@ -8,31 +9,32 @@ set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../libtranspor @@ -8,31 +9,32 @@ set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../libtranspor
set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../libtransport/Util.cpp)
set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc)
if (NOT WIN32)
ADD_LIBRARY(transport-plugin SHARED ${HEADERS} ${SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS} ${EXTRA_SOURCES})
if(NOT WIN32)
add_library(transport-plugin SHARED ${HEADERS} ${SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS} ${EXTRA_SOURCES})
else()
ADD_LIBRARY(transport-plugin STATIC ${HEADERS} ${SRC} ${EXTRA_SOURCES} )
add_library(transport-plugin STATIC ${HEADERS} ${SRC} ${EXTRA_SOURCES} )
endif()
ADD_DEPENDENCIES(transport-plugin pb)
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
if (CMAKE_COMPILER_IS_GNUCXX)
if (NOT WIN32)
ADD_DEFINITIONS(-fPIC)
add_dependencies(transport-plugin pb)
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
if(CMAKE_COMPILER_IS_GNUCXX)
if(NOT WIN32)
add_definitions(-fPIC)
endif()
endif()
if (NOT WIN32)
TARGET_LINK_LIBRARIES(transport-plugin ${PROTOBUF_LIBRARY} ${LOG4CXX_LIBRARIES} ${Boost_LIBRARIES})
if(NOT WIN32)
target_link_libraries(transport-plugin ${PROTOBUF_LIBRARY} ${LOG4CXX_LIBRARIES} ${Boost_LIBRARIES})
else()
TARGET_LINK_LIBRARIES(transport-plugin ${PROTOBUF_LIBRARY} ${LOG4CXX_LIBRARIES} ${Boost_LIBRARIES} ws2_32.lib)
target_link_libraries(transport-plugin ${PROTOBUF_LIBRARY} ${LOG4CXX_LIBRARIES} ${Boost_LIBRARIES} ws2_32.lib)
endif()
SET_TARGET_PROPERTIES(transport-plugin PROPERTIES
VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
set_target_properties(transport-plugin PROPERTIES
VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
)
INSTALL(TARGETS transport-plugin LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries)
install(TARGETS transport-plugin LIBRARY DESTINATION ${LIB_install_DIR} ARCHIVE DESTINATION ${LIB_install_DIR} COMPONENT libraries)
#CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_SOURCE_DIR}/transport.pc")
#INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/transport.pc" DESTINATION lib/pkgconfig)
#configure_file(transport.pc.in "${CMAKE_CURRENT_SOURCE_DIR}/transport.pc")
#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/transport.pc" DESTINATION lib/pkgconfig)

20
plugin/python/CMakeLists.txt

@ -1,15 +1,11 @@ @@ -1,15 +1,11 @@
cmake_minimum_required(VERSION 2.6)
if (PROTOBUF_FOUND)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/protocol_pb2.py
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --python_out ${CMAKE_CURRENT_SOURCE_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/ ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.proto
COMMENT "Running Python protocol buffer compiler on protocol.proto"
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.proto
)
ADD_CUSTOM_TARGET(pb-python ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/protocol_pb2.py)
if(PROTOBUF_FOUND)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/protocol_pb2.py
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --python_out ${CMAKE_CURRENT_SOURCE_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/ ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.proto
COMMENT "Running Python protocol buffer compiler on protocol.proto"
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.proto
)
add_custom_target(pb-python ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/protocol_pb2.py)
endif()

2
spectrum/CMakeLists.txt

@ -1 +1 @@ @@ -1 +1 @@
ADD_SUBDIRECTORY(src)
add_subdirectory(src)

51
spectrum/src/CMakeLists.txt

@ -1,56 +1,53 @@ @@ -1,56 +1,53 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp)
# include_directories(frontends/xmpp)
file(GLOB SRC *.cpp)
#include_directories(frontends/xmpp)
ADD_SUBDIRECTORY(frontends)
add_subdirectory(frontends)
if (WIN32)
FILE(GLOB WIN_SRC win32/*.cpp)
include_directories(win32)
include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
ADD_EXECUTABLE(spectrum2 ${SRC} ${WIN_SRC})
if(WIN32)
file(GLOB WIN_SRC win32/*.cpp)
include_directories(win32)
include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
add_executable(spectrum2 ${SRC} ${WIN_SRC})
else()
ADD_EXECUTABLE(spectrum2 ${SRC})
add_executable(spectrum2 ${SRC})
endif()
ADD_DEPENDENCIES(spectrum2 spectrum2_libpurple_backend)
add_dependencies(spectrum2 spectrum2_libpurple_backend)
target_link_libraries(spectrum2 transport spectrum2-xmpp-frontend spectrum2-slack-frontend ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY})
if (NOT MSVC AND NOT APPLE)
# export all symbols (used for loading frontends)
set(CMAKE_EXE_LINKER_FLAGS "-Wl,-export-dynamic")
if(NOT MSVC AND NOT APPLE)
# export all symbols (used for loading frontends)
set(CMAKE_EXE_LINKER_FLAGS "-Wl,-export-dynamic")
endif()
INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)
install(TARGETS spectrum2 RUNTIME DESTINATION bin)
INSTALL(FILES
install(FILES
sample2_gateway.cfg
RENAME spectrum.cfg.example
DESTINATION /etc/spectrum2/transports
)
)
INSTALL(FILES
install(FILES
sample2.cfg
RENAME spectrum_server_mode.cfg.example
DESTINATION /etc/spectrum2/transports
)
)
INSTALL(FILES
install(FILES
backend-logging.cfg
DESTINATION /etc/spectrum2
)
)
INSTALL(FILES
install(FILES
logging.cfg
DESTINATION /etc/spectrum2
)
)
INSTALL(FILES
install(FILES
manager-logging.cfg
DESTINATION /etc/spectrum2
)
)

4
spectrum/src/frontends/CMakeLists.txt

@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
ADD_SUBDIRECTORY(xmpp)
ADD_SUBDIRECTORY(slack)
add_subdirectory(xmpp)
add_subdirectory(slack)

31
spectrum/src/frontends/slack/CMakeLists.txt

@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB HEADERS ${CMAKE_SOURCE_DIR}/include/transport/*.h)
file(GLOB SRC *.cpp *.h)
file(GLOB HEADERS ${CMAKE_SOURCE_DIR}/include/transport/*.h)
include_directories(${CMAKE_SOURCE_DIR}/spectrum/src/frontends/slack)
if (NOT WIN32)
ADD_LIBRARY(spectrum2-slack-frontend STATIC ${HEADERS} ${SRC} ${EXTRA_SOURCES})
if(NOT WIN32)
add_library(spectrum2-slack-frontend STATIC ${HEADERS} ${SRC} ${EXTRA_SOURCES})
else()
ADD_LIBRARY(spectrum2-slack-frontend STATIC ${HEADERS} ${SRC} ${EXTRA_SOURCES} )
add_library(spectrum2-slack-frontend STATIC ${HEADERS} ${SRC} ${EXTRA_SOURCES} )
endif()
ADD_DEPENDENCIES(spectrum2-slack-frontend transport)
if (CMAKE_COMPILER_IS_GNUCXX)
if (NOT WIN32)
ADD_DEFINITIONS(-fPIC)
add_dependencies(spectrum2-slack-frontend transport)
if(CMAKE_COMPILER_IS_GNUCXX)
if(NOT WIN32)
add_definitions(-fPIC)
endif()
endif()
TARGET_LINK_LIBRARIES(spectrum2-slack-frontend transport ${LOG4CXX_LIBRARIES} ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY})
# SET_TARGET_PROPERTIES(transport-plugin PROPERTIES
# VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
# )
target_link_libraries(spectrum2-slack-frontend transport ${LOG4CXX_LIBRARIES} ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY})
# INSTALL(TARGETS transport-plugin LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries)
#set_target_properties(transport-plugin PROPERTIES
# VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
#)
# install(TARGETS transport-plugin LIBRARY DESTINATION ${LIB_install_DIR} ARCHIVE DESTINATION ${LIB_install_DIR} COMPONENT libraries)

27
spectrum/src/frontends/xmpp/CMakeLists.txt

@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB HEADERS ${CMAKE_SOURCE_DIR}/include/transport/*.h)
file(GLOB SRC *.cpp *.h)
file(GLOB HEADERS ${CMAKE_SOURCE_DIR}/include/transport/*.h)
include_directories(${CMAKE_SOURCE_DIR}/spectrum/src/frontends/xmpp)
if (NOT WIN32)
ADD_LIBRARY(spectrum2-xmpp-frontend STATIC ${HEADERS} ${SRC} ${EXTRA_SOURCES})
if(NOT WIN32)
add_library(spectrum2-xmpp-frontend STATIC ${HEADERS} ${SRC} ${EXTRA_SOURCES})
else()
ADD_LIBRARY(spectrum2-xmpp-frontend STATIC ${HEADERS} ${SRC} ${EXTRA_SOURCES} )
add_library(spectrum2-xmpp-frontend STATIC ${HEADERS} ${SRC} ${EXTRA_SOURCES} )
endif()
ADD_DEPENDENCIES(spectrum2-xmpp-frontend transport)
if (CMAKE_COMPILER_IS_GNUCXX)
if (NOT WIN32)
ADD_DEFINITIONS(-fPIC)
add_dependencies(spectrum2-xmpp-frontend transport)
if(CMAKE_COMPILER_IS_GNUCXX)
if(NOT WIN32)
add_definitions(-fPIC)
endif()
endif()
TARGET_LINK_LIBRARIES(spectrum2-xmpp-frontend transport ${LOG4CXX_LIBRARIES} ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY})
target_link_libraries(spectrum2-xmpp-frontend transport ${LOG4CXX_LIBRARIES} ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY})
# SET_TARGET_PROPERTIES(transport-plugin PROPERTIES
# set_target_properties(transport-plugin PROPERTIES
# VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
# )
# INSTALL(TARGETS transport-plugin LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries)
# install(TARGETS transport-plugin LIBRARY DESTINATION ${LIB_install_DIR} ARCHIVE DESTINATION ${LIB_install_DIR} COMPONENT libraries)

2
spectrum_manager/CMakeLists.txt

@ -1 +1 @@ @@ -1 +1 @@
ADD_SUBDIRECTORY(src)
add_subdirectory(src)

37
spectrum_manager/src/CMakeLists.txt

@ -1,40 +1,39 @@ @@ -1,40 +1,39 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp *.c)
ADD_EXECUTABLE(spectrum2_manager ${SRC})
file(GLOB SRC *.cpp *.c)
ADD_DEPENDENCIES(spectrum2_manager pb)
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
add_executable(spectrum2_manager ${SRC})
add_dependencies(spectrum2_manager pb)
set_source_files_properties()(${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
target_link_libraries(spectrum2_manager transport ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES})
if (${OPENSSL_FOUND})
add_definitions(-DMG_ENABLE_SSL)
if(${OPENSSL_FOUND})
add_definitions(-DMG_ENABLE_SSL)
endif()
if (CMAKE_COMPILER_IS_GNUCXX)
target_link_libraries(spectrum2_manager ${OPENSSL_LIBRARIES})
if(CMAKE_COMPILER_IS_GNUCXX)
target_link_libraries(spectrum2_manager ${OPENSSL_LIBRARIES})
endif()
if(APPLE)
target_link_libraries(spectrum2_manager transport ${APPLE_FRAMEWORKS})
target_link_libraries(spectrum2_manager transport ${APPLE_FRAMEWORKS})
endif()
INSTALL(TARGETS spectrum2_manager RUNTIME DESTINATION bin)
install(TARGETS spectrum2_manager RUNTIME DESTINATION bin)
# IF(NOT EXISTS "/etc/spectrum2/spectrum_manager.cfg")
# INSTALL(FILES
# if(NOT EXISTS "/etc/spectrum2/spectrum_manager.cfg")
# install(FILES
# spectrum_manager.cfg
# DESTINATION /etc/spectrum2
# )
# ENDIF()
# endif()
install(CODE "
if (NOT EXISTS \"$ENV{DESTDIR}/etc/spectrum2/spectrum_manager.cfg\")
file(INSTALL DESTINATION \"/etc/spectrum2\" TYPE FILES \"${CMAKE_CURRENT_SOURCE_DIR}/spectrum_manager.cfg\")
if(NOT EXISTS \"$ENV{DESTDIR}/etc/spectrum2/spectrum_manager.cfg\")
file(install DESTINATION \"/etc/spectrum2\" TYPE FILES \"${CMAKE_CURRENT_SOURCE_DIR}/spectrum_manager.cfg\")
endif()
")
INSTALL(DIRECTORY
install(DIRECTORY
html
DESTINATION /var/lib/spectrum2_manager
)
)

17
tests/CMakeLists.txt

@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
ADD_SUBDIRECTORY(libtransport)
add_subdirectory(libtransport)
add_custom_target(test
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/libtransport/libtransport_test
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests_output
)
add_custom_target(extended_test
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/libtransport/libtransport_test
COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/start.py
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests_output
)
if (PROTOBUF_FOUND)
if (PURPLE_FOUND)
ADD_SUBDIRECTORY(libpurple)
ADD_CUSTOM_TARGET(test_backend_libpurple
if(PROTOBUF_FOUND)
if(PURPLE_FOUND)
add_subdirectory(libpurple)
add_custom_target(test_backend_libpurple
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/libpurple/backend_libpurple_test
)
ADD_DEPENDENCIES(test test_backend_libpurple)
ADD_DEPENDENCIES(extended_test test_backend_libpurple)
add_dependencies(test test_backend_libpurple)
add_dependencies(extended_test test_backend_libpurple)
endif()
endif()
endif()

11
tests/libpurple/CMakeLists.txt

@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp *.h)
file(GLOB SRC *.cpp *.h)
include_directories(../../backends/libpurple)