StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity
bf42872bb3
toxcore/CMakeLists.txt

481 lines
13 KiB
CMake
Raw Normal View History

Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
cmake_minimum_required(VERSION 2.8.6)
project(toxcore)
include(CTest)
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
# This version is for the entire project. All libraries (core, av, ...) move in
# versions in a synchronised way.
Add version-sync script to update all places with versions. This will update tox.in.h only. Currently, you will still need to manually update tox.h. An upcoming PR (#154) will update tox.h as part of the build.
2016-09-24 06:34:16 +08:00
set(PROJECT_VERSION_MAJOR "0")
set(PROJECT_VERSION_MINOR "0")
set(PROJECT_VERSION_PATCH "1")
set(PROJECT_VERSION
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
################################################################################
#
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# :: Dependencies and configuration
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
#
################################################################################
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
include(ApiDsl)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
include(CheckCCompilerFlag)
include(ModulePackage)
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
set(CMAKE_MACOSX_RPATH ON)
Add missing DHT_bootstrap to CMakeLists.txt. - This PR also adds a DEBUG cmake option that enables -DTOX_DEBUG. - We also remove `-Wall`, because there are too many warnings, and nobody really looks at them at the moment. We'll see about fixing them soon. We'll also want to enable `-Werror` at some point. - Finally, this PR enables `-O3` to make sure toxcore still works correctly under heavy compiler optimisations.
2016-08-18 00:36:05 +08:00
option(DEBUG "Enable assertions and other debugging facilities" OFF)
if(DEBUG)
add_definitions(-DTOX_DEBUG=1)
Move logging to a callback. This removes the global logger (which by the way was deleted when the first tox was killed, so other toxes would then stop logging). Various bits of the code now carry a logger or pass it around. It's a bit less transparent now, but now there is no need to have a global logger, and clients can decide what to log and where.
2016-08-19 20:07:45 +08:00
add_definitions(-DMIN_LOGGER_LEVEL=LOG_TRACE)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
check_c_compiler_flag("-g3" HAVE_G3)
if(HAVE_G3)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
endif()
Add missing DHT_bootstrap to CMakeLists.txt. - This PR also adds a DEBUG cmake option that enables -DTOX_DEBUG. - We also remove `-Wall`, because there are too many warnings, and nobody really looks at them at the moment. We'll see about fixing them soon. We'll also want to enable `-Werror` at some point. - Finally, this PR enables `-O3` to make sure toxcore still works correctly under heavy compiler optimisations.
2016-08-18 00:36:05 +08:00
endif()
Build assoc DHT code on travis.
2016-08-20 06:31:01 +08:00
option(ASSOC_DHT "Enable module to store currently unused ID <=> IP associations" OFF)
if(ASSOC_DHT)
add_definitions(-DENABLE_ASSOC_DHT=1)
endif()
Add address sanitizer option to cmake file.
2016-08-26 22:43:29 +08:00
option(ASAN "Enable address-sanitizer to detect invalid memory accesses" OFF)
if(ASAN)
set(SAFE_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
set(CMAKE_REQUIRED_LIBRARIES "-fsanitize=address")
check_c_compiler_flag("-fsanitize=address" HAVE_ASAN)
if(HAVE_ASAN)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
Add address sanitizer option to cmake file.
2016-08-26 22:43:29 +08:00
endif()
set(CMAKE_REQUIRED_LIBRARIES "${SAFE_CMAKE_REQUIRED_LIBRARIES}")
endif()
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
find_package(Threads REQUIRED)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
find_library(NCURSES_LIBRARIES ncurses )
find_library(UTIL_LIBRARIES util )
find_library(RT_LIBRARIES rt )
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Enable build of av_test. It has not been built in a while. We do want to keep this one working (or at least compiling).
2016-08-31 02:48:19 +08:00
# For toxcore.
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
pkg_use_module(LIBSODIUM REQUIRED libsodium )
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Enable build of av_test. It has not been built in a while. We do want to keep this one working (or at least compiling).
2016-08-31 02:48:19 +08:00
# For toxav.
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
pkg_use_module(OPUS opus )
pkg_use_module(VPX vpx )
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Enable build of av_test. It has not been built in a while. We do want to keep this one working (or at least compiling).
2016-08-31 02:48:19 +08:00
# For tox-bootstrapd.
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
pkg_use_module(LIBCONFIG libconfig )
Enable build of av_test. It has not been built in a while. We do want to keep this one working (or at least compiling).
2016-08-31 02:48:19 +08:00
# For auto tests.
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
pkg_use_module(CHECK check )
Enable build of av_test. It has not been built in a while. We do want to keep this one working (or at least compiling).
2016-08-31 02:48:19 +08:00
# For av_test.
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
pkg_use_module(OPENCV opencv )
pkg_use_module(PORTAUDIO portaudio-2.0 )
pkg_use_module(SNDFILE sndfile )
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
if(OPUS_FOUND AND VPX_FOUND)
set(BUILD_TOXAV TRUE)
else()
set(BUILD_TOXAV FALSE)
endif()
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
################################################################################
#
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# :: Tox Core Library
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
#
################################################################################
Fix windows build. The threading networking functions (on windows: winsock and friends) need to be linked into the toxnetwork library, not the toxcore library, anymore. On Linux and OSX, there is no winsock. On OSX, there is no need to link against threading libraries, and on Linux, toxnetwork can have unresolved symbols when linking, so this failure wasn't caught before. Tested by building on the iphydf/windows-x86-qt5 docker image.
2016-08-18 17:29:39 +08:00
# toxcore_PKGCONFIG_LIBS is what's added to the Libs: line in toxcore.pc. It
# needs to contain all the libraries a program using toxcore should link against
# if it's statically linked. If it's dynamically linked, there is no need to
# explicitly link against all the dependencies, but it doesn't harm much(*)
# either.
#
# (*) It allows client code to use symbols from our dependencies without
# explicitly linking against them.
set(toxcore_PKGCONFIG_LIBS)
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# LAYER 1: Crypto core
# --------------------
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
add_module(toxcrypto
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/crypto_core.c
toxcore/crypto_core.h)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxcrypto ${LIBSODIUM_LIBRARIES})
Fix for windows dynamic libraries.
2016-09-17 20:48:11 +08:00
if(WIN32)
target_link_modules(toxcrypto ws2_32) # for htonl
endif()
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# LAYER 2: Basic networking
# -------------------------
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
add_module(toxnetwork
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
toxcore/logger.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/logger.h
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
toxcore/network.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/network.h
toxcore/util.c
toxcore/util.h)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxnetwork toxcrypto)
Fix windows build. The threading networking functions (on windows: winsock and friends) need to be linked into the toxnetwork library, not the toxcore library, anymore. On Linux and OSX, there is no winsock. On OSX, there is no need to link against threading libraries, and on Linux, toxnetwork can have unresolved symbols when linking, so this failure wasn't caught before. Tested by building on the iphydf/windows-x86-qt5 docker image.
2016-08-18 17:29:39 +08:00
if(CMAKE_THREAD_LIBS_INIT)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxnetwork ${CMAKE_THREAD_LIBS_INIT})
Fix windows build. The threading networking functions (on windows: winsock and friends) need to be linked into the toxnetwork library, not the toxcore library, anymore. On Linux and OSX, there is no winsock. On OSX, there is no need to link against threading libraries, and on Linux, toxnetwork can have unresolved symbols when linking, so this failure wasn't caught before. Tested by building on the iphydf/windows-x86-qt5 docker image.
2016-08-18 17:29:39 +08:00
set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} "-l${CMAKE_THREAD_LIBS_INIT}")
endif()
Add missing DHT_bootstrap to CMakeLists.txt. - This PR also adds a DEBUG cmake option that enables -DTOX_DEBUG. - We also remove `-Wall`, because there are too many warnings, and nobody really looks at them at the moment. We'll see about fixing them soon. We'll also want to enable `-Werror` at some point. - Finally, this PR enables `-O3` to make sure toxcore still works correctly under heavy compiler optimisations.
2016-08-18 00:36:05 +08:00
if(RT_LIBRARIES)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxnetwork ${RT_LIBRARIES})
Add missing DHT_bootstrap to CMakeLists.txt. - This PR also adds a DEBUG cmake option that enables -DTOX_DEBUG. - We also remove `-Wall`, because there are too many warnings, and nobody really looks at them at the moment. We'll see about fixing them soon. We'll also want to enable `-Werror` at some point. - Finally, this PR enables `-O3` to make sure toxcore still works correctly under heavy compiler optimisations.
2016-08-18 00:36:05 +08:00
set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} "-lrt")
endif()
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
Fix windows build. The threading networking functions (on windows: winsock and friends) need to be linked into the toxnetwork library, not the toxcore library, anymore. On Linux and OSX, there is no winsock. On OSX, there is no need to link against threading libraries, and on Linux, toxnetwork can have unresolved symbols when linking, so this failure wasn't caught before. Tested by building on the iphydf/windows-x86-qt5 docker image.
2016-08-18 17:29:39 +08:00
if(WIN32)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxnetwork ws2_32 iphlpapi)
Fix windows build. The threading networking functions (on windows: winsock and friends) need to be linked into the toxnetwork library, not the toxcore library, anymore. On Linux and OSX, there is no winsock. On OSX, there is no need to link against threading libraries, and on Linux, toxnetwork can have unresolved symbols when linking, so this failure wasn't caught before. Tested by building on the iphydf/windows-x86-qt5 docker image.
2016-08-18 17:29:39 +08:00
set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} "-lws2_32 -liphlpapi")
endif()
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# LAYER 3: Distributed Hash Table
# -------------------------------
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
add_module(toxdht
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxcore/DHT.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/DHT.h
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxcore/LAN_discovery.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/LAN_discovery.h
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
toxcore/assoc.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/assoc.h
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
toxcore/ping.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/ping.h
toxcore/ping_array.c
toxcore/ping_array.h)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxdht toxnetwork)
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# LAYER 4: Onion routing, TCP connections, crypto connections
# -----------------------------------------------------------
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
add_module(toxnetcrypto
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxcore/TCP_client.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/TCP_client.h
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxcore/TCP_connection.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/TCP_connection.h
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxcore/TCP_server.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/TCP_server.h
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxcore/list.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/list.h
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxcore/net_crypto.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/net_crypto.h
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxcore/onion.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/onion.h
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxcore/onion_announce.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/onion_announce.h
toxcore/onion_client.c
toxcore/onion_client.h)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxnetcrypto toxdht)
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# LAYER 5: Friend requests and connections
# ----------------------------------------
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
add_module(toxfriends
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
toxcore/friend_connection.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/friend_connection.h
toxcore/friend_requests.c
toxcore/friend_requests.h)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxfriends toxnetcrypto)
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# LAYER 6: Tox messenger
# ----------------------
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
add_module(toxmessenger
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/Messenger.c
toxcore/Messenger.h)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxmessenger toxfriends)
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# LAYER 7: Group chats
# --------------------
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
add_module(toxgroup
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/group.c
toxcore/group.h)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxgroup toxmessenger)
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# LAYER 8: Public API
# -------------------
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
apidsl(
toxcore/tox.api.h)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
add_module(toxcore
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxcore/misc_tools.h
toxcore/tox.c
toxcore/tox.h)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxcore toxgroup)
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
################################################################################
#
# :: Audio/Video Library
#
################################################################################
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
if(BUILD_TOXAV)
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
apidsl(
toxav/toxav.api.h)
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
add_module(toxav
toxav/audio.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxav/audio.h
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
toxav/bwcontroller.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxav/bwcontroller.h
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
toxav/group.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxav/group.h
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
toxav/msi.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxav/msi.h
Move ring buffer out of toxcore/util into toxav. Toxcore itself doesn't use this data structure. Only toxav does, so now toxav owns the code for it.
2016-09-22 22:20:33 +08:00
toxav/ring_buffer.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxav/ring_buffer.h
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
toxav/rtp.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxav/rtp.h
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
toxav/toxav.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxav/toxav.h
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
toxav/toxav_old.c
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
toxav/video.c
toxav/video.h)
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
target_link_modules(toxav toxcore ${OPUS_LIBRARIES} ${VPX_LIBRARIES})
endif()
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
################################################################################
#
# :: ToxDNS and block encryption libraries
#
################################################################################
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
add_module(toxdns
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxdns/toxdns.c)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxdns toxcore)
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
add_module(toxencryptsave
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxencryptsave/toxencryptsave.c)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxencryptsave toxcore)
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
################################################################################
#
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# :: Automated regression tests
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
#
################################################################################
Add option to set test timeout Some tests take 20 or more minutes to run before they timeout, this allows to limit their runtime if needed.
2016-10-05 00:48:24 +08:00
set(TEST_TIMEOUT_SECONDS "" CACHE STRING "Limit runtime of each test to the number of seconds specified")
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
if(APIDSL AND ASTYLE)
add_test(
NAME format_test
COMMAND ${CMAKE_SOURCE_DIR}/other/astyle/format-source
"${CMAKE_SOURCE_DIR}"
"${APIDSL}"
"${ASTYLE}")
Add option to set test timeout Some tests take 20 or more minutes to run before they timeout, this allows to limit their runtime if needed.
2016-10-05 00:48:24 +08:00
set_tests_properties(format_test PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")
Rebuild apidsl'd headers in cmake. - Moved apidsl headers next to their generated versions. In the future, perhaps all (or most) headers will be apidsl-generated, so the sources should stay together. - Try to find apidsl/apigen binary and astyle binary and use it for the format test. Don't run the format test if these can't be found.
2016-09-21 17:51:58 +08:00
endif()
Add cmake test for apidsl.
2016-08-20 02:31:08 +08:00
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
function(auto_test target)
if(CHECK_FOUND)
Remove the _test suffix in auto_test calls. All tests must end in `_test` so we can use this convention to slightly shorten the names in `auto_test` calls. This also enforces the convention so future tests obey it.
2016-09-27 06:39:47 +08:00
add_c_executable(auto_${target}_test auto_tests/${target}_test.c)
target_link_modules(auto_${target}_test
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
toxcore
toxencryptsave
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
${CHECK_LIBRARIES})
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
if(BUILD_TOXAV)
Remove the _test suffix in auto_test calls. All tests must end in `_test` so we can use this convention to slightly shorten the names in `auto_test` calls. This also enforces the convention so future tests obey it.
2016-09-27 06:39:47 +08:00
target_link_modules(auto_${target}_test toxav)
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
endif()
Remove the _test suffix in auto_test calls. All tests must end in `_test` so we can use this convention to slightly shorten the names in `auto_test` calls. This also enforces the convention so future tests obey it.
2016-09-27 06:39:47 +08:00
add_test(NAME ${target} COMMAND auto_${target}_test)
Add option to set test timeout Some tests take 20 or more minutes to run before they timeout, this allows to limit their runtime if needed.
2016-10-05 00:48:24 +08:00
set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
endif()
endfunction()
Remove the _test suffix in auto_test calls. All tests must end in `_test` so we can use this convention to slightly shorten the names in `auto_test` calls. This also enforces the convention so future tests obey it.
2016-09-27 06:39:47 +08:00
auto_test(TCP)
auto_test(assoc)
auto_test(crypto)
auto_test(dht)
auto_test(encryptsave)
auto_test(messenger)
auto_test(network)
auto_test(onion)
auto_test(skeleton)
auto_test(tox)
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
if(BUILD_TOXAV)
Remove the _test suffix in auto_test calls. All tests must end in `_test` so we can use this convention to slightly shorten the names in `auto_test` calls. This also enforces the convention so future tests obey it.
2016-09-27 06:39:47 +08:00
auto_test(toxav_basic)
auto_test(toxav_many)
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
endif()
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Build tox-bootstrapd in the cmake build.
2016-08-11 02:39:59 +08:00
################################################################################
#
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# :: Bootstrap daemon
Build tox-bootstrapd in the cmake build.
2016-08-11 02:39:59 +08:00
#
################################################################################
Make toxcore code C++ compatible. It is still C code, so still compatible with C compilers as well. This change lets us see more clearly where implicit conversions occur by making them explicit.
2016-09-18 08:31:55 +08:00
add_c_executable(DHT_bootstrap
Add missing DHT_bootstrap to CMakeLists.txt. - This PR also adds a DEBUG cmake option that enables -DTOX_DEBUG. - We also remove `-Wall`, because there are too many warnings, and nobody really looks at them at the moment. We'll see about fixing them soon. We'll also want to enable `-Werror` at some point. - Finally, this PR enables `-O3` to make sure toxcore still works correctly under heavy compiler optimisations.
2016-08-18 00:36:05 +08:00
other/DHT_bootstrap.c
other/bootstrap_node_packets.c)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(DHT_bootstrap toxnetcrypto)
Add missing DHT_bootstrap to CMakeLists.txt. - This PR also adds a DEBUG cmake option that enables -DTOX_DEBUG. - We also remove `-Wall`, because there are too many warnings, and nobody really looks at them at the moment. We'll see about fixing them soon. We'll also want to enable `-Werror` at some point. - Finally, this PR enables `-O3` to make sure toxcore still works correctly under heavy compiler optimisations.
2016-08-18 00:36:05 +08:00
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
if(LIBCONFIG_FOUND)
Make toxcore code C++ compatible. It is still C code, so still compatible with C compilers as well. This change lets us see more clearly where implicit conversions occur by making them explicit.
2016-09-18 08:31:55 +08:00
add_c_executable(tox-bootstrapd
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
other/bootstrap_daemon/src/command_line_arguments.c
other/bootstrap_daemon/src/command_line_arguments.h
other/bootstrap_daemon/src/config.c
other/bootstrap_daemon/src/config_defaults.h
other/bootstrap_daemon/src/config.h
other/bootstrap_daemon/src/log.c
other/bootstrap_daemon/src/log.h
other/bootstrap_daemon/src/tox-bootstrapd.c
other/bootstrap_daemon/src/global.h
other/bootstrap_node_packets.c
other/bootstrap_node_packets.h)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(tox-bootstrapd toxnetcrypto ${LIBCONFIG_LIBRARIES})
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
endif()
Build tox-bootstrapd in the cmake build.
2016-08-11 02:39:59 +08:00
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
################################################################################
#
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# :: Test programs
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
#
################################################################################
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
if(NOT WIN32 AND BUILD_TOXAV AND SNDFILE_FOUND AND PORTAUDIO_FOUND AND OPENCV_FOUND)
Make toxcore code C++ compatible. It is still C code, so still compatible with C compilers as well. This change lets us see more clearly where implicit conversions occur by making them explicit.
2016-09-18 08:31:55 +08:00
add_c_executable(av_test testing/av_test.c)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(av_test
Enable build of av_test. It has not been built in a while. We do want to keep this one working (or at least compiling).
2016-08-31 02:48:19 +08:00
toxav
${OPENCV_LIBRARIES}
${PORTAUDIO_LIBRARIES}
${SNDFILE_LIBRARIES})
Work around bug in opencv3 headers. OpenCV 3.1 doesn't define cvRound in C, only in C++. Thus, we now need to compile av_test as C++ code.
2016-09-22 07:42:14 +08:00
# Due to https://github.com/opencv/opencv/issues/6585, we need to compile
# av_test as C++ for newer OpenCV versions.
if(NOT OPENCV_VERSION VERSION_LESS 3)
set_source_files_properties(testing/av_test.c PROPERTIES LANGUAGE CXX)
endif()
Enable build of av_test. It has not been built in a while. We do want to keep this one working (or at least compiling).
2016-08-31 02:48:19 +08:00
endif()
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
if(NOT WIN32)
Make toxcore code C++ compatible. It is still C code, so still compatible with C compilers as well. This change lets us see more clearly where implicit conversions occur by making them explicit.
2016-09-18 08:31:55 +08:00
add_c_executable(nTox testing/nTox.c)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(nTox toxcore ${NCURSES_LIBRARIES})
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
endif()
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Make toxcore code C++ compatible. It is still C code, so still compatible with C compilers as well. This change lets us see more clearly where implicit conversions occur by making them explicit.
2016-09-18 08:31:55 +08:00
add_c_executable(DHT_test testing/DHT_test.c)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(DHT_test toxdht)
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Make toxcore code C++ compatible. It is still C code, so still compatible with C compilers as well. This change lets us see more clearly where implicit conversions occur by making them explicit.
2016-09-18 08:31:55 +08:00
add_c_executable(Messenger_test testing/Messenger_test.c)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(Messenger_test toxmessenger)
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Make toxcore code C++ compatible. It is still C code, so still compatible with C compilers as well. This change lets us see more clearly where implicit conversions occur by making them explicit.
2016-09-18 08:31:55 +08:00
add_c_executable(dns3_test testing/dns3_test.c)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(dns3_test toxdns)
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
if(NOT WIN32)
Make toxcore code C++ compatible. It is still C code, so still compatible with C compilers as well. This change lets us see more clearly where implicit conversions occur by making them explicit.
2016-09-18 08:31:55 +08:00
add_c_executable(tox_sync testing/tox_sync.c)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(tox_sync toxcore)
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
endif()
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
if(UTIL_LIBRARIES)
Make toxcore code C++ compatible. It is still C code, so still compatible with C compilers as well. This change lets us see more clearly where implicit conversions occur by making them explicit.
2016-09-18 08:31:55 +08:00
add_c_executable(tox_shell testing/tox_shell.c)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(tox_shell toxcore ${UTIL_LIBRARIES})
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
endif()
if(NOT WIN32)
Make toxcore code C++ compatible. It is still C code, so still compatible with C compilers as well. This change lets us see more clearly where implicit conversions occur by making them explicit.
2016-09-18 08:31:55 +08:00
add_c_executable(irc_syncbot testing/irc_syncbot.c)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(irc_syncbot toxcore)
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
endif()
################################################################################
#
Split toxcore into layers. This allows us to more clearly define interfaces between modules, and have the linker help us ensure that module boundaries are respected. The onion/tcp/net_crypto layer is a bit too large. This is due to a cyclic dependency (onion -> net_crypto -> TCP -> onion). We may or may not want to break that cycle in the future to allow the onion library to exist on its own without net_crypto.
2016-08-16 05:07:49 +08:00
# :: Installation and pkg-config
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
#
################################################################################
Add and use CMake build script Also, fix the hstox build that was taking half an hour. It now takes 5 minutes. Also, perform distcheck on travis to ensure that make dist works. It's not actually failing the build at the moment due to broken tests.
2016-08-10 19:28:33 +08:00
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
if(BUILD_TOXAV)
configure_file(
"${CMAKE_SOURCE_DIR}/other/pkgconfig/toxav.pc.in"
"${CMAKE_BINARY_DIR}/toxav.pc"
@ONLY
)
endif()
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
configure_file(
"${CMAKE_SOURCE_DIR}/other/pkgconfig/toxcore.pc.in"
"${CMAKE_BINARY_DIR}/toxcore.pc"
@ONLY
)
configure_file(
"${CMAKE_SOURCE_DIR}/other/pkgconfig/toxdns.pc.in"
"${CMAKE_BINARY_DIR}/toxdns.pc"
@ONLY
)
configure_file(
"${CMAKE_SOURCE_DIR}/other/pkgconfig/toxencryptsave.pc.in"
"${CMAKE_BINARY_DIR}/toxencryptsave.pc"
@ONLY
)
install(FILES
${CMAKE_BINARY_DIR}/toxcore.pc
${CMAKE_BINARY_DIR}/toxdns.pc
${CMAKE_BINARY_DIR}/toxencryptsave.pc
DESTINATION "lib/pkgconfig")
install(FILES
toxcore/tox.h
toxdns/toxdns.h
toxencryptsave/toxencryptsave.h
DESTINATION "include/tox")
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
if(BUILD_TOXAV)
install(FILES
${CMAKE_BINARY_DIR}/toxav.pc
DESTINATION "lib/pkgconfig")
install(FILES
toxav/toxav.h
DESTINATION "include/tox")
endif()
Add STRICT_ABI cmake flag to generate export lists. Enabling this flag will generate and use an LD version script. It ensures that the dynamic libraries (libtoxcore.so, libtoxav.so) only export the symbols that are defined in their public API (tox.h and toxav.h, respectively).
2016-09-08 17:58:12 +08:00
Add version-sync script to update all places with versions. This will update tox.in.h only. Currently, you will still need to manually update tox.h. An upcoming PR (#154) will update tox.h as part of the build.
2016-09-24 06:34:16 +08:00
################################################################################
#
# :: Update versions in various places
#
################################################################################
find_program(SH NAMES sh dash bash zsh)
if(SH)
execute_process(
COMMAND ${SH} ${CMAKE_SOURCE_DIR}/other/version-sync
${CMAKE_SOURCE_DIR}
${PROJECT_VERSION_MAJOR}
${PROJECT_VERSION_MINOR}
${PROJECT_VERSION_PATCH})
endif()
Add STRICT_ABI cmake flag to generate export lists. Enabling this flag will generate and use an LD version script. It ensures that the dynamic libraries (libtoxcore.so, libtoxav.so) only export the symbols that are defined in their public API (tox.h and toxav.h, respectively).
2016-09-08 17:58:12 +08:00
################################################################################
#
# :: Strict ABI
#
################################################################################
function(make_version_script header ns lib)
execute_process(
Add version-sync script to update all places with versions. This will update tox.in.h only. Currently, you will still need to manually update tox.h. An upcoming PR (#154) will update tox.h as part of the build.
2016-09-24 06:34:16 +08:00
COMMAND ${SH} -c "egrep '^\\w' ${header} | grep '${ns}_[a-z0-9_]*(' | grep -v '^typedef' | grep -o '${ns}_[a-z0-9_]*(' | egrep -o '\\w+' | sort -u"
Add STRICT_ABI cmake flag to generate export lists. Enabling this flag will generate and use an LD version script. It ensures that the dynamic libraries (libtoxcore.so, libtoxav.so) only export the symbols that are defined in their public API (tox.h and toxav.h, respectively).
2016-09-08 17:58:12 +08:00
OUTPUT_VARIABLE ${lib}_SYMS
OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REPLACE "\n" ";" ${lib}_SYMS ${${lib}_SYMS})
set(${lib}_VERSION_SCRIPT "${CMAKE_BINARY_DIR}/${lib}.ld")
file(WRITE ${${lib}_VERSION_SCRIPT}
"{ global:\n")
foreach(sym ${${lib}_SYMS})
file(APPEND ${${lib}_VERSION_SCRIPT}
"${sym};\n")
endforeach(sym)
file(APPEND ${${lib}_VERSION_SCRIPT}
"local: *; };\n")
set_target_properties(${lib}_shared PROPERTIES
LINK_FLAGS -Wl,--version-script,${${lib}_VERSION_SCRIPT})
endfunction()
option(STRICT_ABI "Enforce strict ABI export in dynamic libraries" OFF)
Add OSX and Windows build to travis config. Tests for Windows are disabled for now, until we figure out which tests can successfully run on wine and select only those.
2016-08-25 06:52:34 +08:00
if(WIN32 OR APPLE)
# Windows and OSX don't have this linker functionality.
set(STRICT_ABI OFF)
endif()
Add version-sync script to update all places with versions. This will update tox.in.h only. Currently, you will still need to manually update tox.h. An upcoming PR (#154) will update tox.h as part of the build.
2016-09-24 06:34:16 +08:00
if(STRICT_ABI AND SH)
Add STRICT_ABI cmake flag to generate export lists. Enabling this flag will generate and use an LD version script. It ensures that the dynamic libraries (libtoxcore.so, libtoxav.so) only export the symbols that are defined in their public API (tox.h and toxav.h, respectively).
2016-09-08 17:58:12 +08:00
if(BUILD_TOXAV)
make_version_script(${CMAKE_SOURCE_DIR}/toxav/toxav.h toxav toxav)
endif()
make_version_script(${CMAKE_SOURCE_DIR}/toxcore/tox.h tox toxcore)
endif()
Reference in New Issue Copy Permalink