Browse Source
- use tabs for indention - use lower-case commands - fix superfluous newlines at end of filesmaster
Steffen Vogel
4 years ago
committed by
vitalyster
29 changed files with 387 additions and 390 deletions
@ -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() |
||||
|
||||
@ -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) |
||||
|
||||
@ -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) |
||||
|
||||
|
||||
@ -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) |
||||
|
||||
@ -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) |
||||
|
||||
@ -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) |
||||
|
||||
@ -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) |
||||
|
||||
@ -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) |
||||
|
||||
@ -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}) |
||||
|
||||
@ -1,2 +1,2 @@
@@ -1,2 +1,2 @@
|
||||
ADD_SUBDIRECTORY(api) |
||||
ADD_SUBDIRECTORY(guide) |
||||
add_subdirectory(api) |
||||
add_subdirectory(guide) |
||||
|
||||
@ -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}) |
||||
|
||||
@ -1 +1 @@
@@ -1 +1 @@
|
||||
ADD_SUBDIRECTORY(transport) |
||||
add_subdirectory(transport) |
||||
|
||||
@ -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) |
||||
|
||||
@ -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) |
||||
|
||||
@ -1,2 +1,2 @@
@@ -1,2 +1,2 @@
|
||||
ADD_SUBDIRECTORY(cpp) |
||||
ADD_SUBDIRECTORY(python) |
||||
add_subdirectory(cpp) |
||||
add_subdirectory(python) |
||||
|
||||
@ -1 +1 @@
@@ -1 +1 @@
|
||||
ADD_SUBDIRECTORY(src) |
||||
add_subdirectory(src) |
||||
|
||||
@ -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 |
||||
) |
||||
|
||||
) |
||||
|
||||
@ -1,2 +1,2 @@
@@ -1,2 +1,2 @@
|
||||
ADD_SUBDIRECTORY(xmpp) |
||||
ADD_SUBDIRECTORY(slack) |
||||
add_subdirectory(xmpp) |
||||
add_subdirectory(slack) |
||||
|
||||
@ -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) |
||||
|
||||
@ -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) |
||||
|
||||
@ -1 +1 @@
@@ -1 +1 @@
|
||||
ADD_SUBDIRECTORY(src) |
||||
add_subdirectory(src) |
||||
|
||||
@ -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 |
||||
) |
||||
) |
||||
|
||||
@ -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() |
||||
|
||||