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
a3079e82dd
toxcore/CMakeLists.txt

588 lines
18 KiB
CMake
Raw Normal View History

Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
################################################################################
#
# The main toxcore CMake build file.
#
# This file when processed with cmake produces:
# - A number of small libraries (.a/.so/...) containing independent components
# of toxcore. E.g. the DHT has its own library, and the system/network
# abstractions are in their own library as well. These libraries are not
Remove deprecated ToxDNS Based on #331. Fixes #42.
2017-12-29 08:29:14 +08:00
# installed on `make install`. The toxav, and toxencryptsave libraries are
# also not installed.
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
# - A number of small programs, statically linked if possible.
Remove deprecated ToxDNS Based on #331. Fixes #42.
2017-12-29 08:29:14 +08:00
# - One big library containing all of the toxcore, toxav, and toxencryptsave
# code.
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +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
cmake_minimum_required(VERSION 2.8.6)
Add appveyor build for native windows tests. It doesn't compile, yet. A few changes (like VLA support) need to be made before we can enable appveyor as a required PR check.
2017-01-21 01:42:30 +08:00
cmake_policy(VERSION 2.8.6)
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
project(toxcore)
SO versions for cmake and libtool this updates the version-sync script to generate proper SO versions which will be used by cmake and libtool to create version symlinks on the system when a library is installed as well as setting the SO version in the binary. To see what this does, you have to configure tox with a prefix: ./configure --prefix=/tmp/tox-with-libtool mkdir cbuild && cd cbuild && cmake -DCMAKE_INSTALL_PREFIX=/tmp/tox-with-cmake .. Then run `make && make install`. in both instances you should see the following installed in `lib/`: libtoxcore.so -> libtoxcore.so.1.4.0 libtoxcore.so.1 -> libtoxcore.so.1.4.0 libtoxcore.so.1.4.0 inside the binary the soname should be the one with .1 and it should not contain the full version: $ objdump -p libtoxcore.so.1.4.0 | grep SONAME SONAME libtoxcore.so.1
2017-01-16 04:22:35 +08:00
set(CMAKE_MODULE_PATH ${toxcore_SOURCE_DIR}/cmake)
################################################################################
#
# :: Version management
#
################################################################################
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")
Bump toxcore version to 0.2.0. We're not releasing yet, but projects preparing for the release will want to build against this version in master.
2018-01-09 03:36:00 +08:00
set(PROJECT_VERSION_MINOR "2")
set(PROJECT_VERSION_PATCH "0")
SO versions for cmake and libtool this updates the version-sync script to generate proper SO versions which will be used by cmake and libtool to create version symlinks on the system when a library is installed as well as setting the SO version in the binary. To see what this does, you have to configure tox with a prefix: ./configure --prefix=/tmp/tox-with-libtool mkdir cbuild && cd cbuild && cmake -DCMAKE_INSTALL_PREFIX=/tmp/tox-with-cmake .. Then run `make && make install`. in both instances you should see the following installed in `lib/`: libtoxcore.so -> libtoxcore.so.1.4.0 libtoxcore.so.1 -> libtoxcore.so.1.4.0 libtoxcore.so.1.4.0 inside the binary the soname should be the one with .1 and it should not contain the full version: $ objdump -p libtoxcore.so.1.4.0 | grep SONAME SONAME libtoxcore.so.1
2017-01-16 04:22:35 +08:00
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
# set .so library version / following libtool scheme
# https://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
file(STRINGS ${toxcore_SOURCE_DIR}/so.version SOVERSION_CURRENT REGEX "^CURRENT=[0-9]+$")
string(SUBSTRING "${SOVERSION_CURRENT}" 8 -1 SOVERSION_CURRENT)
file(STRINGS ${toxcore_SOURCE_DIR}/so.version SOVERSION_REVISION REGEX "^REVISION=[0-9]+$")
string(SUBSTRING "${SOVERSION_REVISION}" 9 -1 SOVERSION_REVISION)
file(STRINGS ${toxcore_SOURCE_DIR}/so.version SOVERSION_AGE REGEX "^AGE=[0-9]+$")
string(SUBSTRING "${SOVERSION_AGE}" 4 -1 SOVERSION_AGE)
# account for some libtool magic, see other/version-sync script for details
math(EXPR SOVERSION_MAJOR ${SOVERSION_CURRENT}-${SOVERSION_AGE})
set(SOVERSION "${SOVERSION_MAJOR}.${SOVERSION_AGE}.${SOVERSION_REVISION}")
message("SOVERSION: ${SOVERSION}")
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
################################################################################
#
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
#
################################################################################
Forbid undefined symbols in shared libraries. Also a little bit of refactoring: - Moved add_cflag and friends from CMakeLists.txt to a separate AddCompilerFlag module. - Build the spectest SUT if msgpack is found, even if spectest itself is not found, so once it exists, users can run it themselves or reconfigure cmake.
2017-06-04 08:36:18 +08:00
include(AddCompilerFlag)
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)
Install libraries with RPATH. This makes deployment easier, as the install libpath is used to look up dependent libraries.
2016-10-06 22:13:47 +08:00
include(MacRpath)
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
include(ModulePackage)
Factor out strict_abi cmake code into a separate module.
2017-06-04 20:20:35 +08:00
include(StrictAbi)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
Replace include(CTest) on enable_testing() CTest include generate a lot of unused targets
2017-08-06 19:28:16 +08:00
enable_testing()
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 appveyor build for native windows tests. It doesn't compile, yet. A few changes (like VLA support) need to be made before we can enable appveyor as a required PR check.
2017-01-21 01:42:30 +08:00
if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
# Set standard version for compiler.
add_cflag("-std=c99")
add_cxxflag("-std=c++11")
# Warn on non-ISO C.
add_cflag("-pedantic")
option(WARNINGS "Enable additional compiler warnings" ON)
if(WARNINGS)
# Add all warning flags we can.
add_flag("-Wall")
add_flag("-Wextra")
add_flag("-Weverything")
# Disable specific warning flags for both C and C++.
add_flag("-Wno-cast-align")
add_flag("-Wno-conversion")
add_flag("-Wno-covered-switch-default")
Disable -Wdisabled-macro-expansion Due to clang's tolower() macro being recursive.
2017-02-24 13:19:42 +08:00
# Due to clang's tolower() macro being recursive https://github.com/TokTok/c-toxcore/pull/481
add_flag("-Wno-disabled-macro-expansion")
Add appveyor build for native windows tests. It doesn't compile, yet. A few changes (like VLA support) need to be made before we can enable appveyor as a required PR check.
2017-01-21 01:42:30 +08:00
add_flag("-Wno-documentation-deprecated-sync")
add_flag("-Wno-format-nonliteral")
add_flag("-Wno-missing-field-initializers")
add_flag("-Wno-missing-prototypes")
add_flag("-Wno-padded")
add_flag("-Wno-parentheses")
add_flag("-Wno-return-type")
add_flag("-Wno-sign-compare")
add_flag("-Wno-sign-conversion")
add_flag("-Wno-tautological-constant-out-of-range-compare")
Disable compiler thread safety analysis
2017-06-05 20:59:51 +08:00
# Our use of mutexes results in a false positive, see 1bbe446
add_flag("-Wno-thread-safety-analysis")
Add appveyor build for native windows tests. It doesn't compile, yet. A few changes (like VLA support) need to be made before we can enable appveyor as a required PR check.
2017-01-21 01:42:30 +08:00
add_flag("-Wno-type-limits")
add_flag("-Wno-undef")
add_flag("-Wno-unreachable-code")
add_flag("-Wno-unused-macros")
add_flag("-Wno-unused-parameter")
add_flag("-Wno-vla")
# Disable specific warning flags for C.
add_cflag("-Wno-assign-enum")
add_cflag("-Wno-bad-function-cast")
add_cflag("-Wno-double-promotion")
add_cflag("-Wno-gnu-zero-variadic-macro-arguments")
add_cflag("-Wno-packed")
add_cflag("-Wno-reserved-id-macro")
add_cflag("-Wno-shadow")
add_cflag("-Wno-shorten-64-to-32")
add_cflag("-Wno-unreachable-code-return")
add_cflag("-Wno-unused-but-set-variable")
add_cflag("-Wno-used-but-marked-unused")
# Disable specific warning flags for C++.
add_cxxflag("-Wno-c++11-compat")
add_cxxflag("-Wno-c++11-extensions")
add_cxxflag("-Wno-c++11-narrowing")
add_cxxflag("-Wno-c99-extensions")
add_cxxflag("-Wno-narrowing")
add_cxxflag("-Wno-old-style-cast")
add_cxxflag("-Wno-variadic-macros")
add_cxxflag("-Wno-vla-extension")
endif()
Enable all possible C compiler warning flags. We disable the ones that fire, so we can use -Werror. We can then investigate each warning individually and see whether to fix it or to keep silencing it.
2016-11-02 23:13:06 +08:00
Add appveyor build for native windows tests. It doesn't compile, yet. A few changes (like VLA support) need to be made before we can enable appveyor as a required PR check.
2017-01-21 01:42:30 +08:00
option(ERROR_ON_WARNING "Make compilation error on a warning" OFF)
if(ERROR_ON_WARNING)
# Set error-on-warn for C compilation. C++ compilation can't use this because
# treating 'c' input as 'c++' when in C++ mode is deprecated in clang and
# there is no way to turn off that warning.
add_cflag("-Werror")
endif()
Don't error on warnings by default Having -Werror set by default causes users' builds to fail because toxcore is not warning-free. Failing on errors is appropriate for the development phase, e.g. when building it in a CI enviroment, but it doesn't make much sense to fail builds for users and let them figure out that they need to pass -DWARNINGS=OFF to make the library build.
2016-11-28 04:24:18 +08:00
Add appveyor build for native windows tests. It doesn't compile, yet. A few changes (like VLA support) need to be made before we can enable appveyor as a required PR check.
2017-01-21 01:42:30 +08:00
option(DEBUG "Enable assertions and other debugging facilities" OFF)
if(DEBUG)
set(MIN_LOGGER_LEVEL DEBUG)
add_cflag("-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()
Set log level for DEBUG=ON to LOG_DEBUG. We use TRACE=ON (cmake flag) to enable LOG_TRACE. This way, a regular build can enable DEBUG while not paying the price of TRACE. This is particularly important for FFI bindings (especially Python), where invoking callbacks can be an expensive operation.
2016-10-01 02:13:29 +08:00
option(TRACE "Enable TRACE level logging (expensive, for network debugging)" OFF)
if(TRACE)
set(MIN_LOGGER_LEVEL TRACE)
endif()
if(MIN_LOGGER_LEVEL)
add_definitions(-DMIN_LOGGER_LEVEL=LOG_${MIN_LOGGER_LEVEL})
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")
Enable all possible C compiler warning flags. We disable the ones that fire, so we can use -Werror. We can then investigate each warning individually and see whether to fix it or to keep silencing it.
2016-11-02 23:13:06 +08:00
add_cflag("-fsanitize=address")
Add address sanitizer option to cmake file.
2016-08-26 22:43:29 +08:00
set(CMAKE_REQUIRED_LIBRARIES "${SAFE_CMAKE_REQUIRED_LIBRARIES}")
Forbid undefined symbols in shared libraries. Also a little bit of refactoring: - Moved add_cflag and friends from CMakeLists.txt to a separate AddCompilerFlag module. - Build the spectest SUT if msgpack is found, even if spectest itself is not found, so once it exists, users can run it themselves or reconfigure cmake.
2017-06-04 08:36:18 +08:00
else()
# Forbid undefined symbols in shared libraries. This is incompatible with
# asan, so it's in the else branch here.
add_dllflag("-Wl,-z,defs")
Add address sanitizer option to cmake file.
2016-08-26 22:43:29 +08:00
endif()
Add support of IPv6 disabling
2017-11-15 17:48:48 +08:00
option(USE_IPV6 "Use IPv6 in tests" ON)
if(NOT USE_IPV6)
add_definitions(-DUSE_IPV6=0)
endif()
make BUILD_TOXAV and option and fail if dependencies are missing fixes #482
2017-02-21 06:33:50 +08:00
option(BUILD_TOXAV "Whether to build the tox AV library" ON)
Add appveyor build for native windows tests. It doesn't compile, yet. A few changes (like VLA support) need to be made before we can enable appveyor as a required PR check.
2017-01-21 01:42:30 +08:00
include(Dependencies)
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
Add a monolith_test that includes all toxcore sources. This requires that every symbol, even if static (file-scope), is unique. The idea is that we can easily run "whole" program static analysis on programs that include monolith.h ("whole" is in quotes, as we don't include dependencies like libsodium in this static analysis).
2017-06-04 20:59:34 +08:00
if(BUILD_TOXAV)
make BUILD_TOXAV and option and fail if dependencies are missing fixes #482
2017-02-21 06:33:50 +08:00
if(NOT OPUS_FOUND)
message(SEND_ERROR "Option BUILD_TOXAV is enabled but required library OPUS was not found.")
endif()
if(NOT VPX_FOUND)
message(SEND_ERROR "Option BUILD_TOXAV is enabled but required library VPX was not found.")
endif()
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
################################################################################
#
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
#
################################################################################
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
# --------------------
Fix formatting and spelling in version-sync script. Also some minor reformatting and fixes to the hstox sut driver.
2017-06-04 20:07:43 +08:00
apidsl(toxcore/crypto_core.api.h)
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
add_submodule(toxcore toxcrypto
Add VLA compatibility macro for C89-ish compilers.
2017-01-21 05:16:55 +08:00
toxcore/ccompat.h
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
Add secure memcmp and memzero implementation. Implementation mostly taken from libsodium utils. Fix #347
2016-12-20 14:39:14 +08:00
toxcore/crypto_core.h
toxcore/crypto_core_mem.c)
include(CheckFunctionExists)
check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO)
check_function_exists(memset_s HAVE_MEMSET_S)
Add option to build static libraries.
2016-09-12 01:49:44 +08:00
target_link_modules(toxcrypto ${LIBSODIUM_LIBRARIES})
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
set(toxcrypto_PKGCONFIG_REQUIRES ${toxcrypto_PKGCONFIG_REQUIRES} libsodium)
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
# -------------------------
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
add_submodule(toxcore 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})
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
set(toxnetwork_PKGCONFIG_LIBS ${toxnetwork_PKGCONFIG_LIBS} ${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
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})
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
set(toxnetwork_PKGCONFIG_LIBS ${toxnetwork_PKGCONFIG_LIBS} "-lrt")
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()
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)
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
set(toxnetwork_PKGCONFIG_LIBS ${toxnetwork_PKGCONFIG_LIBS} "-lws2_32 -liphlpapi")
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
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
# -------------------------------
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
add_submodule(toxcore 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/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
# -----------------------------------------------------------
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
add_submodule(toxcore 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
# ----------------------------------------
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
add_submodule(toxcore 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
# ----------------------
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
add_submodule(toxcore 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
# --------------------
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
add_submodule(toxcore 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
# -------------------
Fix formatting and spelling in version-sync script. Also some minor reformatting and fixes to the hstox sut driver.
2017-06-04 20:07:43 +08:00
apidsl(toxcore/tox.api.h)
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
add_submodule(toxcore toxapi
Use `tox_options_set_*` instead of direct member access. Also added a `tox_options_copy` function for cloning an options object. This can be useful when creating several Tox instances with slightly varying options.
2016-12-16 01:35:54 +08:00
toxcore/tox_api.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/tox.c
toxcore/tox.h)
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
target_link_modules(toxapi toxgroup)
set(toxapi_API_HEADERS ${toxcore_SOURCE_DIR}/toxcore/tox.h^tox)
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)
Fix formatting and spelling in version-sync script. Also some minor reformatting and fixes to the hstox sut driver.
2017-06-04 20:07:43 +08:00
apidsl(toxav/toxav.api.h)
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
add_submodule(toxcore toxav
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +08:00
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
toxav renaming: group.{h,c} -> groupav.{h,c} toxav file for "group" conflicts with toxcore "group" file. While this works fine in almost all cases, Xcode on macOS is confused with that.
2016-10-29 04:11:48 +08:00
toxav/groupav.c
toxav/groupav.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)
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
target_link_modules(toxav toxgroup ${OPUS_LIBRARIES} ${VPX_LIBRARIES})
set(toxav_PKGCONFIG_REQUIRES ${toxav_PKGCONFIG_REQUIRES} opus vpx)
set(toxav_API_HEADERS ${toxcore_SOURCE_DIR}/toxav/toxav.h^toxav)
make_version_script(toxav ${toxav_API_HEADERS})
Only build toxav if opus and vpx are found.
2016-09-18 09:18:24 +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
################################################################################
#
Remove deprecated ToxDNS Based on #331. Fixes #42.
2017-12-29 08:29:14 +08:00
# :: Block encryption libraries
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
#
################################################################################
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 formatting and spelling in version-sync script. Also some minor reformatting and fixes to the hstox sut driver.
2017-06-04 20:07:43 +08:00
apidsl(toxencryptsave/toxencryptsave.api.h)
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
add_submodule(toxcore toxencryptsave
Add apidsl file for toxencryptsave. This breaks the toxencryptsave API. It hides the Tox_Pass_Key struct definition.
2016-12-10 19:21:22 +08:00
toxencryptsave/toxencryptsave.c
toxencryptsave/toxencryptsave.h)
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
target_link_modules(toxencryptsave toxcrypto)
set(toxencryptsave_API_HEADERS ${toxcore_SOURCE_DIR}/toxencryptsave/toxencryptsave.h^tox)
################################################################################
#
# :: All layers together in one library for ease of use
#
################################################################################
# Create combined library from all the sources.
add_module(toxcore ${toxcore_SOURCES})
# Link it to all dependencies.
foreach(sublib ${toxcore_SUBLIBS})
set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${${sublib}_LINK_MODULES})
endforeach()
target_link_modules(toxcore ${toxcore_LINK_MODULES})
# Concatenate all the pkg-config Libs: lines.
foreach(sublib ${toxcore_SUBLIBS})
set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} ${${sublib}_PKGCONFIG_LIBS})
endforeach()
# Concatenate all the pkg-config Requires: lines.
foreach(sublib ${toxcore_SUBLIBS})
set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} ${${sublib}_PKGCONFIG_REQUIRES})
endforeach()
# Collect all API headers.
foreach(sublib ${toxcore_SUBLIBS})
set(toxcore_API_HEADERS ${toxcore_API_HEADERS} ${${sublib}_API_HEADERS})
endforeach()
# Make version script (on systems that support it) to limit symbol visibility.
make_version_script(toxcore ${toxcore_API_HEADERS})
# Generate pkg-config file, install library to "lib" and install headers to
# "include/tox".
install_module(toxcore DESTINATION "include/tox")
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 spectest to the cmake test suite. This allows for easier development. It is not used on travis (yet).
2016-11-09 05:56:54 +08:00
################################################################################
#
# :: Tox specification tests
#
################################################################################
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
find_program(SPECTEST NAMES
tox-spectest
../.stack-work/install/x86_64-linux/lts-2.22/7.8.4/bin/tox-spectest)
Add spectest to the cmake test suite. This allows for easier development. It is not used on travis (yet).
2016-11-09 05:56:54 +08:00
Use new encoding of `Maybe` in msgpack results. The new encoding is `0` for `Nothing` and `[1, x]` for `Just x`.
2017-01-21 01:03:30 +08:00
if(NOT SPECTEST)
find_program(STACK NAMES stack)
if(STACK)
set(SPECTEST
${STACK} --stack-yaml ${toxcore_SOURCE_DIR}/../stack.yaml exec --
tox-spectest)
endif()
endif()
Forbid undefined symbols in shared libraries. Also a little bit of refactoring: - Moved add_cflag and friends from CMakeLists.txt to a separate AddCompilerFlag module. - Build the spectest SUT if msgpack is found, even if spectest itself is not found, so once it exists, users can run it themselves or reconfigure cmake.
2017-06-04 08:36:18 +08:00
if(MSGPACK_FOUND)
Add spectest to the cmake test suite. This allows for easier development. It is not used on travis (yet).
2016-11-09 05:56:54 +08:00
add_c_executable(toxcore-sut
testing/hstox/binary_decode.c
testing/hstox/binary_encode.c
testing/hstox/driver.c
testing/hstox/methods.c
testing/hstox/packet_kinds.c
testing/hstox/test_main.c
testing/hstox/util.c)
target_link_modules(toxcore-sut
toxcore
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
toxdht
toxnetcrypto
Add spectest to the cmake test suite. This allows for easier development. It is not used on travis (yet).
2016-11-09 05:56:54 +08:00
${MSGPACK_LIBRARIES})
Forbid undefined symbols in shared libraries. Also a little bit of refactoring: - Moved add_cflag and friends from CMakeLists.txt to a separate AddCompilerFlag module. - Build the spectest SUT if msgpack is found, even if spectest itself is not found, so once it exists, users can run it themselves or reconfigure cmake.
2017-06-04 08:36:18 +08:00
if(SPECTEST)
add_test(NAME spectest COMMAND ${SPECTEST} $<TARGET_FILE:toxcore-sut>)
endif()
Add spectest to the cmake test suite. This allows for easier development. It is not used on travis (yet).
2016-11-09 05:56:54 +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
################################################################################
#
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")
Error if format_test can't be executed. This ensures that on Travis, format_test will always be executed, or the build fails.
2016-10-24 23:06:09 +08:00
option(FORMAT_TEST "Require the format_test to be executed; fail cmake if it can't" OFF)
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
simplify integration as a third-party lib in cmake projects The CMAKE_SOURCE_DIR variable points to the top-level directory of a project while we want to point to the top-level directory of the lib. This change simplifies the integration as a third-party lib. We can use CMAKE_CURRENT_SOURCE_DIR or simply "nothing" ('.') to point to the directory where the CMakeLists.txt file resides.
2016-12-28 07:30:17 +08:00
COMMAND ${toxcore_SOURCE_DIR}/other/astyle/format-source
"${toxcore_SOURCE_DIR}"
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}"
"${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}")
Error if format_test can't be executed. This ensures that on Travis, format_test will always be executed, or the build fails.
2016-10-24 23:06:09 +08:00
elseif(FORMAT_TEST)
message(FATAL_ERROR "format_test can not be run, because either APIDSL (${APIDSL}) or ASTYLE (${ASTYLE}) could not be found")
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)
Build tests on appveyor, the MSVC build. Tests are not actually ran on appveyor for now, since they all fault for some reason. For now, we just build them. Also, some tests are disabled on msvc entirely, because they don't even compile. We'll need to look into those, later. They are disabled using `MSVC_DONT_BUILD`.
2017-06-05 04:58:28 +08:00
if(CHECK_FOUND AND NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" AND ARGV1 STREQUAL "MSVC_DONT_BUILD"))
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
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
toxcrypto
toxmessenger
toxnetcrypto
Add "make install" step to Travis build.
2016-08-11 20:49:49 +08:00
${CHECK_LIBRARIES})
Build tests on appveyor, the MSVC build. Tests are not actually ran on appveyor for now, since they all fault for some reason. For now, we just build them. Also, some tests are disabled on msvc entirely, because they don't even compile. We'll need to look into those, later. They are disabled using `MSVC_DONT_BUILD`.
2017-06-05 04:58:28 +08:00
if(NOT ARGV1 STREQUAL "DONT_RUN")
add_test(NAME ${target} COMMAND auto_${target}_test)
set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")
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
endif()
endfunction()
Add a monolith_test that includes all toxcore sources. This requires that every symbol, even if static (file-scope), is unique. The idea is that we can easily run "whole" program static analysis on programs that include monolith.h ("whole" is in quotes, as we don't include dependencies like libsodium in this static analysis).
2017-06-04 20:59:34 +08:00
if(BUILD_TOXAV)
Add support for building the monolith test on android.
2018-01-07 07:37:51 +08:00
add_c_executable(auto_monolith_test
auto_tests/monolith_test.c
${ANDROID_CPU_FEATURES})
Add a monolith_test that includes all toxcore sources. This requires that every symbol, even if static (file-scope), is unique. The idea is that we can easily run "whole" program static analysis on programs that include monolith.h ("whole" is in quotes, as we don't include dependencies like libsodium in this static analysis).
2017-06-04 20:59:34 +08:00
target_link_modules(auto_monolith_test
${LIBSODIUM_LIBRARIES}
${OPUS_LIBRARIES}
Fix Windows build
2017-06-10 11:18:43 +08:00
${VPX_LIBRARIES}
${toxcore_PKGCONFIG_LIBS})
Add a monolith_test that includes all toxcore sources. This requires that every symbol, even if static (file-scope), is unique. The idea is that we can easily run "whole" program static analysis on programs that include monolith.h ("whole" is in quotes, as we don't include dependencies like libsodium in this static analysis).
2017-06-04 20:59:34 +08:00
add_test(NAME monolith COMMAND auto_monolith_test)
Add support for building the monolith test on android.
2018-01-07 07:37:51 +08:00
if(ANDROID_CPU_FEATURES)
target_compile_definitions(auto_monolith_test PRIVATE -Dtypeof=__typeof__)
endif()
Add a monolith_test that includes all toxcore sources. This requires that every symbol, even if static (file-scope), is unique. The idea is that we can easily run "whole" program static analysis on programs that include monolith.h ("whole" is in quotes, as we don't include dependencies like libsodium in this static analysis).
2017-06-04 20:59:34 +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
auto_test(TCP)
Remove duplicate tests: split tests part 2.
2016-10-11 19:52:06 +08:00
auto_test(conference)
Build tests on appveyor, the MSVC build. Tests are not actually ran on appveyor for now, since they all fault for some reason. For now, we just build them. Also, some tests are disabled on msvc entirely, because they don't even compile. We'll need to look into those, later. They are disabled using `MSVC_DONT_BUILD`.
2017-06-05 04:58:28 +08:00
auto_test(crypto MSVC_DONT_BUILD)
auto_test(dht MSVC_DONT_BUILD)
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(encryptsave)
Build tests on appveyor, the MSVC build. Tests are not actually ran on appveyor for now, since they all fault for some reason. For now, we just build them. Also, some tests are disabled on msvc entirely, because they don't even compile. We'll need to look into those, later. They are disabled using `MSVC_DONT_BUILD`.
2017-06-05 04:58:28 +08:00
auto_test(messenger MSVC_DONT_BUILD)
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(network)
auto_test(onion)
Add test to check if tox_new/tox_kill leaks. We create and destroy 20k tox instances and run a single tox_iterate on it. This test is not comprehensive, but provides a simple check to see whether the destruction properly cleans up memory and perhaps other resources.
2016-12-19 05:30:05 +08:00
auto_test(resource_leak)
Fix padding in SAVED_FRIEND struct and add test. Test covers saving and loading of a Tox instance with a friend added.
2016-12-10 22:12:32 +08:00
auto_test(save_friend)
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(skeleton)
auto_test(tox)
Remove duplicate tests: split tests part 2.
2016-10-11 19:52:06 +08:00
auto_test(tox_many)
auto_test(tox_many_tcp)
auto_test(tox_one)
Add test for tox_strncasecmp()
2017-02-27 01:56:55 +08:00
auto_test(tox_strncasecmp)
Fix version compatibility test. Also added some test cases for it.
2016-12-12 00:45:03 +08:00
auto_test(version)
Add test for changing the conference title and not receiving a callback.
2017-03-09 22:15:07 +08:00
# TODO(iphydf): These tests are broken. The code needs to be fixed, as the
# tests themselves are correct.
Build tests on appveyor, the MSVC build. Tests are not actually ran on appveyor for now, since they all fault for some reason. For now, we just build them. Also, some tests are disabled on msvc entirely, because they don't even compile. We'll need to look into those, later. They are disabled using `MSVC_DONT_BUILD`.
2017-06-05 04:58:28 +08:00
auto_test(selfname_change_conference DONT_RUN)
auto_test(self_conference_title_change DONT_RUN)
Fix version compatibility test. Also added some test cases for it.
2016-12-12 00:45:03 +08:00
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 building `DHT_bootstrap` in cmake optional. It's enabled by default.
2017-01-17 06:43:08 +08:00
option(DHT_BOOTSTRAP "Enable building of DHT_bootstrap" ON)
if(DHT_BOOTSTRAP)
add_c_executable(DHT_bootstrap
other/DHT_bootstrap.c
other/bootstrap_node_packets.c)
target_link_modules(DHT_bootstrap toxnetcrypto)
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
Add option to build tox-bootstrapd When cross-compiling to <target> from Linux, cmake might find native Linux libconfig and decide to build tox-bootstrapd. If the target is Windows, this will fail, as tox-bootstrapd can't be built for Windows in the first place. If the target is Linux of some other architecture, then using host native libconfig will fail too. Thus an option is needed to guard against this.
2016-10-03 13:52:43 +08:00
option(BOOTSTRAP_DAEMON "Enable building of tox-bootstrapd" ON)
if(BOOTSTRAP_DAEMON)
if(WIN32)
message(FATAL_ERROR "Building tox-bootstrapd for Windows is not supported")
endif()
if(LIBCONFIG_FOUND)
add_c_executable(tox-bootstrapd
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.h
Split daemon's logging backends in separate modules
2017-03-02 15:38:57 +08:00
other/bootstrap_daemon/src/config_defaults.h
other/bootstrap_daemon/src/global.h
Add option to build tox-bootstrapd When cross-compiling to <target> from Linux, cmake might find native Linux libconfig and decide to build tox-bootstrapd. If the target is Windows, this will fail, as tox-bootstrapd can't be built for Windows in the first place. If the target is Linux of some other architecture, then using host native libconfig will fail too. Thus an option is needed to guard against this.
2016-10-03 13:52:43 +08:00
other/bootstrap_daemon/src/log.c
other/bootstrap_daemon/src/log.h
Split daemon's logging backends in separate modules
2017-03-02 15:38:57 +08:00
other/bootstrap_daemon/src/log_backend_stdout.c
other/bootstrap_daemon/src/log_backend_stdout.h
other/bootstrap_daemon/src/log_backend_syslog.c
other/bootstrap_daemon/src/log_backend_syslog.h
Add option to build tox-bootstrapd When cross-compiling to <target> from Linux, cmake might find native Linux libconfig and decide to build tox-bootstrapd. If the target is Windows, this will fail, as tox-bootstrapd can't be built for Windows in the first place. If the target is Linux of some other architecture, then using host native libconfig will fail too. Thus an option is needed to guard against this.
2016-10-03 13:52:43 +08:00
other/bootstrap_daemon/src/tox-bootstrapd.c
other/bootstrap_node_packets.c
other/bootstrap_node_packets.h)
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
target_link_modules(tox-bootstrapd toxfriends ${LIBCONFIG_LIBRARIES})
CMake: install bootstrapd if it is built if bootstrapd option is enabled the binary should be installed on `make install`.
2017-03-08 04:49:43 +08:00
install(TARGETS tox-bootstrapd RUNTIME DESTINATION bin)
Add option to build tox-bootstrapd When cross-compiling to <target> from Linux, cmake might find native Linux libconfig and decide to build tox-bootstrapd. If the target is Windows, this will fail, as tox-bootstrapd can't be built for Windows in the first place. If the target is Linux of some other architecture, then using host native libconfig will fail too. Thus an option is needed to guard against this.
2016-10-03 13:52:43 +08:00
endif()
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
#
################################################################################
Add knob to suppress building the toxav test
2016-11-23 21:54:41 +08:00
option(BUILD_AV_TEST "Build toxav test" ON)
if(NOT WIN32
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
AND BUILD_AV_TEST 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
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
toxcore
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
${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()
Don't build nTox by default. Build it on Travis. It won't be built on the windows builds regardless of having it enabled globally. Fixes #292.
2016-12-06 06:00:05 +08:00
option(BUILD_NTOX "Build nTox client" OFF)
if(BUILD_NTOX AND 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
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)
Generate only one large library "libtoxcore". This library contains all the code for the old libtoxcore, libtoxav, libtoxdns, and libtoxencryptsave. The build for toxav is still optional, and disabling it causes libtoxcore to simply not contain those symbols and the pkg-config file to not include opus and vpx as dependencies.
2017-01-16 00:16:16 +08:00
target_link_modules(irc_syncbot toxcore toxnetwork)
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
endif()
Reference in New Issue Copy Permalink