Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-10-31 09:20:21 +00:00
Code Issues Projects Releases Wiki Activity
ea3276333a
lokinet/CMakeLists.txt

349 lines
10 KiB
CMake
Raw Normal View History

Consolidate cmake vars & definitions CMake will set version variables itself if you give the version in the project(), which is cleaner. Also removes some (nearly) duplicate definitions and settings added in basic_definitions.cmake for unknown reasons. Removes some redundant settings (name, description, version) from the cpack settings which already default to the values from the project() call.
2020-04-18 18:02:22 +00:00
cmake_minimum_required(VERSION 3.10) # bionic's cmake version
start moving to cmake
2018-05-16 13:56:51 +00:00
Add more junk & clangd symlinks to .gitignore Ignore any root directory starting with build so that you can have many build directories (build, build2, build-win32, ...) that get ignored. Add .cache which clangd creates Ignore compile_commands.json (and generate it by default) which helps clangd, but needs to be symlinked to a compile_commands.json in a build dir so isn't suitable for inclusion in the repo.
2021-02-25 16:50:34 +00:00
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
Bring back ghc::filesystem for broke AF macos macOS doesn't provide `<filesystem>` support when targetting anything earlier than 10.15.
2020-05-20 02:14:21 +00:00
# Has to be set before `project()`, and ignored on non-macos:
Reduce macOS target to 10.12, and fix target for deps (#1414) This is relatively painless for lokinet as it already had workarounds during 0.8 dev work for the things macos hated in 10.13. Dependencies, however, were not being built with the proper macos target junk, so this fixes that.
2020-10-16 09:18:45 +00:00
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "macOS deployment target (Apple clang only)")
Set -mmacosx-version-min the cmake way
2020-04-21 23:00:37 +00:00
Refactor Router code into more classes This commit refactors functionality from the Router class into separate, dedicated classes. There are a few behavior changes that came as a result of discussion on what the correct behavior should be. In addition, many things Router was previously doing can now be provided callback functions to alert the calling point when the asynchronous action completes, successfully or otherwise.
2019-06-26 21:39:29 +00:00
find_program(CCACHE_PROGRAM ccache)
if(CCACHE_PROGRAM)
Modernize how we set up ccache CMAKE_<LANG>_COMPILER_LAUNCHER was added around cmake 3.4 and, usefully, can be enabled/disabled via cmake invocation flags (unlike the older RULE_LAUNCH_COMPILE property).
2020-06-10 16:34:02 +00:00
foreach(lang C CXX)
if(NOT DEFINED CMAKE_${lang}_COMPILER_LAUNCHER AND NOT CMAKE_${lang}_COMPILER MATCHES ".*/ccache")
message(STATUS "Enabling ccache for ${lang}")
set(CMAKE_${lang}_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE STRING "")
endif()
endforeach()
Refactor Router code into more classes This commit refactors functionality from the Router class into separate, dedicated classes. There are a few behavior changes that came as a result of discussion on what the correct behavior should be. In addition, many things Router was previously doing can now be provided callback functions to alert the calling point when the asynchronous action completes, successfully or otherwise.
2019-06-26 21:39:29 +00:00
endif()
Version bump (#1483) * Bump version to 0.8.2 * Let cmake set PROJECT_NAME `project(x ...)` already sets PROJECT_NAME (and CMAKE_PROKECT_NAME if this is the top-level build) to `x`; the logic here seemed sort of backwards. * Get rid of uninstaller entitlement We don't seem to need it anymore with Qt 5.15.1. * Bump windows lokinet-gui build
2020-11-18 11:08:56 +00:00
project(lokinet
bump version
2021-05-17 17:00:34 +00:00
VERSION 0.9.2
Consolidate cmake vars & definitions CMake will set version variables itself if you give the version in the project(), which is cleaner. Also removes some (nearly) duplicate definitions and settings added in basic_definitions.cmake for unknown reasons. Removes some redundant settings (name, description, version) from the cpack settings which already default to the values from the project() call.
2020-04-18 18:02:22 +00:00
DESCRIPTION "lokinet - IP packet onion router"
LANGUAGES C CXX)
make unit tests work
2018-06-14 14:04:42 +00:00
update release motto
2021-05-14 19:15:00 +00:00
set(RELEASE_MOTTO "A Series of Tubes" CACHE STRING "Release motto")
Move release motto string into CMakeLists.txt Right after project() which contains the version, so that version + motto updates are basically in one place (and so that non-Makefile cmake invocations get it).
2020-04-20 02:13:39 +00:00
Consolidate cmake vars & definitions CMake will set version variables itself if you give the version in the project(), which is cleaner. Also removes some (nearly) duplicate definitions and settings added in basic_definitions.cmake for unknown reasons. Removes some redundant settings (name, description, version) from the cpack settings which already default to the values from the project() call.
2020-04-18 18:02:22 +00:00
add_definitions(-DLLARP_VERSION_MAJOR=${lokinet_VERSION_MAJOR})
add_definitions(-DLLARP_VERSION_MINOR=${lokinet_VERSION_MINOR})
add_definitions(-DLLARP_VERSION_PATCH=${lokinet_VERSION_PATCH})
tun code refactor (#1495) * partial tun code refactor * take out the trash * move vpn platform code into llarp/vpn/platform.cpp * fix hive build * fix win32 * fix memory leak on win32 * reduce cpu use * make macos compile * win32 patches: * use wepoll for zmq * use all cores on windows iocp read loop * fix zmq patch for windows * clean up cmake for win32 * add uninstall before reinstall option to win32 installer * more ipv6 stuff * make it compile * fix up route poker * remove an unneeded code block in macos wtf * always use call to system * fix route poker behavior on macos * disable ipv6 on windows for now * cpu perf improvement: * colease calls to Router::PumpLL to 1 per event loop wakeup * set up THEN add addresses * emulate proactor event loop on win32 * remove excessively verbose error message * fix issue #1499 * exclude uv_poll from win32 so that it can start up * update logtag to include directory * create minidump on windows if there was a crash * make windows happy * use dmp suffix on minidump files * typo fix * address feedback from jason * use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR * quote $@ in apply-patches in case path has spaces in it * address feedback from tom * remove llarp/ev/pipe * add comments for clairification * make event loop queue size constant named
2021-01-11 23:13:22 +00:00
if(RELEASE_MOTTO AND CMAKE_BUILD_TYPE MATCHES "[Rr][Ee][Ll][Ee][Aa][Ss][Ee]")
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
add_definitions(-DLLARP_RELEASE_MOTTO="${RELEASE_MOTTO}")
endif()
cpack win32
2020-01-10 19:59:45 +00:00
static build fixes in cmake stuff I hate cmake so much.
2020-06-16 22:17:41 +00:00
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
Refactor CMakeLists into distinct directories
2019-02-09 16:16:00 +00:00
# Core options
get rid of NON_PC_TARGET
2019-11-05 11:45:49 +00:00
option(USE_AVX2 "enable avx2 code" OFF)
option(USE_NETNS "enable networking namespace support. Linux only" OFF)
more
2019-11-05 12:11:05 +00:00
option(NATIVE_BUILD "optimise for host system and FPU" ON)
get rid of NON_PC_TARGET
2019-11-05 11:45:49 +00:00
option(EMBEDDED_CFG "optimise for older hardware or embedded systems" OFF)
redo cmake parts * add liblokinet.so target * make every library we build except liblokinet.so static * wire up parts of liblokinet
2021-03-08 19:19:20 +00:00
option(BUILD_LIBLOKINET "build liblokinet.so" ON)
get rid of NON_PC_TARGET
2019-11-05 11:45:49 +00:00
option(SHADOW "use shadow testing framework. linux only" OFF)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
option(XSAN "use sanitiser, if your system has it (requires -DCMAKE_BUILD_TYPE=Debug)" OFF)
exit traffic via loki addresses
2020-05-21 14:18:23 +00:00
option(WITH_JEMALLOC "use jemalloc as allocator" OFF)
get rid of NON_PC_TARGET
2019-11-05 11:45:49 +00:00
option(TESTNET "testnet build" OFF)
option(WITH_COVERAGE "generate coverage data" OFF)
correct cmake paramter for shellhooks
2019-07-29 12:14:35 +00:00
option(USE_SHELLHOOKS "enable shell hooks on compile time (dangerous)" OFF)
finally make -WX/-Werror optional
2019-03-19 00:22:37 +00:00
option(WARNINGS_AS_ERRORS "treat all warnings as errors. turn off for development, on for release" OFF)
get rid of NON_PC_TARGET
2019-11-05 11:45:49 +00:00
option(TRACY_ROOT "include tracy profiler source" OFF)
option(WITH_TESTS "build unit tests" ON)
add build infra for toggling hive builds
2020-02-27 19:43:16 +00:00
option(WITH_HIVE "build simulation stubs" OFF)
Add -DBUILD_PACKAGE=ON to make cpack code opt-in
2020-04-18 21:50:07 +00:00
option(BUILD_PACKAGE "builds extra components for making an installer (with 'make package')" OFF)
detect travis using environmental vars
2020-05-15 13:12:00 +00:00
add functionality to download and build static libs The libs with rules already set up in StaticBuild.cmake are dependencies which will be introduced in following commits.
2020-06-15 20:25:28 +00:00
include(cmake/enable_lto.cmake)
option(BUILD_STATIC_DEPS "Download, build, and statically link against core dependencies" OFF)
option(STATIC_LINK "link statically against dependencies" ${BUILD_STATIC_DEPS})
if(BUILD_STATIC_DEPS AND NOT STATIC_LINK)
message(FATAL_ERROR "Option BUILD_STATIC_DEPS requires STATIC_LINK to be enabled as well")
endif()
if(BUILD_STATIC_DEPS)
lokinet-bootstrap native binary
2021-04-15 17:39:45 +00:00
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
add functionality to download and build static libs The libs with rules already set up in StaticBuild.cmake are dependencies which will be introduced in following commits.
2020-06-15 20:25:28 +00:00
include(StaticBuild)
endif()
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo)
hive pytest framework in place (and path build test works)!
2020-03-03 04:15:18 +00:00
endif()
fix release target
2018-06-15 13:42:49 +00:00
check for std::optional as macos can be broke af sometimes
2020-05-15 13:40:24 +00:00
include(CheckCXXSourceCompiles)
include(CheckLibraryExists)
exit traffic via loki addresses
2020-05-21 14:18:23 +00:00
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_C_STANDARD 99)
set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_C_EXTENSIONS OFF)
check for std::optional as macos can be broke af sometimes
2020-05-15 13:40:24 +00:00
Add cmake module to target a library as 'system', and fix a few warnings
2019-04-24 23:27:31 +00:00
include(cmake/target_link_libraries_system.cmake)
Refactor top level cmake file into multiple components
2019-04-29 23:48:43 +00:00
include(cmake/add_import_library.cmake)
include(cmake/add_log_tag.cmake)
new cmake module
2019-08-29 13:59:04 +00:00
include(cmake/libatomic.cmake)
fix up cmake lokimq target
2020-09-19 13:50:54 +00:00
include(cmake/link_dep_libs.cmake)
Add cmake module to target a library as 'system', and fix a few warnings
2019-04-24 23:27:31 +00:00
when STATIC_LINK search for static versions of libraries, delay CURL detection until later
2019-12-23 06:50:59 +00:00
if (STATIC_LINK)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
message(STATUS "setting static library suffix search")
endif()
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
add_definitions(-D${CMAKE_SYSTEM_NAME})
Refactor CMakeLists into distinct directories
2019-02-09 16:16:00 +00:00
Refactor top level cmake file into multiple components
2019-04-29 23:48:43 +00:00
if(MSVC_VERSION)
Allow builds on MSVC (#518) * Import cxxopts to replace getopts usage * Add visual studio build things * Fixup abseil build parts * Replace __attribute__((unused)) with ABSL_ATTRIBUTE_UNUSED * Fixup minor windows build issues * Replace getopts usage * Temporarily fixup .rc files * More minor windows fixes * Get a working build * Revert .rc files * Revert changes to nodedb
2019-04-19 18:24:33 +00:00
enable_language(ASM_MASM)
list(APPEND CMAKE_ASM_MASM_SOURCE_FILE_EXTENSIONS s)
build gtest/gmock in shared mode
2019-07-17 18:57:15 +00:00
add_definitions(-D_WIN32_WINNT=0x0600 -DNOMINMAX -DSODIUM_STATIC)
Allow builds on MSVC (#518) * Import cxxopts to replace getopts usage * Add visual studio build things * Fixup abseil build parts * Replace __attribute__((unused)) with ABSL_ATTRIBUTE_UNUSED * Fixup minor windows build issues * Replace getopts usage * Temporarily fixup .rc files * More minor windows fixes * Get a working build * Revert .rc files * Revert changes to nodedb
2019-04-19 18:24:33 +00:00
else()
enable_language(ASM)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endif()
Allow builds on MSVC (#518) * Import cxxopts to replace getopts usage * Add visual studio build things * Fixup abseil build parts * Replace __attribute__((unused)) with ABSL_ATTRIBUTE_UNUSED * Fixup minor windows build issues * Replace getopts usage * Temporarily fixup .rc files * More minor windows fixes * Get a working build * Revert .rc files * Revert changes to nodedb
2019-04-19 18:24:33 +00:00
More work on router docker image - Multi-stage docker build (final image only 15MB!) - Build in release mode - Fix bug with release mode - Fix compiler being dumb AF - Disable FORTIFY for now - Enable LTO when making a staticly linked release - Fix some gcc specific warnings - Refactor cmake stuff into multiple files
2019-04-28 15:57:41 +00:00
include(cmake/solaris.cmake)
Tidy up cmake files
2019-07-21 23:39:56 +00:00
include(cmake/win32.cmake)
make gitlab pump out 32 bit installers, no lto for builds as that is cursed for now.
2020-03-12 16:22:33 +00:00
# No in-source building
include(MacroEnsureOutOfSourceBuild)
macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out-of-source build. Create a build directory and run 'cmake ${CMAKE_SOURCE_DIR} [options]'.")
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
# Always build PIC
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
move cmake unix down
2020-03-12 16:29:12 +00:00
include(cmake/unix.cmake)
move check for std::filesystem and std::optional down
2020-05-15 13:43:53 +00:00
include(cmake/check_for_std_optional.cmake)
include(cmake/check_for_std_filesystem.cmake)
move cmake unix down
2020-03-12 16:29:12 +00:00
move it
2019-11-05 11:58:40 +00:00
if(NOT WIN32)
detect properly for mobile
2019-11-05 12:01:14 +00:00
if(IOS OR ANDROID)
move it
2019-11-05 11:58:40 +00:00
set(NON_PC_TARGET ON)
detect properly for mobile
2019-11-05 12:01:14 +00:00
else()
include(TargetArch)
target_architecture(COMPILE_ARCH)
if(COMPILE_ARCH MATCHES i386 OR COMPILE_ARCH MATCHES x86_64)
set(NON_PC_TARGET OFF)
else()
set(NON_PC_TARGET ON)
endif()
move it
2019-11-05 11:58:40 +00:00
endif()
endif()
distinguish good solaris from bad solaris
2019-03-24 00:40:19 +00:00
move pkgconfig requirement (#1355)
2020-09-22 17:59:33 +00:00
find_package(PkgConfig REQUIRED)
libuv cmake fixups (#1511) * fix up cmake parts for libuv * make libuv use external project via StaticBuild.cmake * remove libuv submodule
2021-01-17 00:11:28 +00:00
if(NOT BUILD_STATIC_DEPS)
Downgrade required libuv version to 1.18 (1.18 is the version found in bionic).
2021-01-18 22:24:28 +00:00
pkg_check_modules(LIBUV libuv>=1.18.0 IMPORTED_TARGET)
libuv cmake fixups (#1511) * fix up cmake parts for libuv * make libuv use external project via StaticBuild.cmake * remove libuv submodule
2021-01-17 00:11:28 +00:00
endif()
if(LIBUV_FOUND AND NOT BUILD_STATIC_DEPS)
add_library(libuv INTERFACE)
target_link_libraries(libuv INTERFACE PkgConfig::LIBUV)
else()
if(NOT BUILD_STATIC_DEPS)
message(FATAL_ERROR "Could not find libu >= 1.28.0; install it on your system or use -DBUILD_STATIC_DEPS=ON")
endif()
endif()
remove FindSodium.cmake and use the cmake incantations from loki-core for setting sodium target up
2020-06-26 17:59:36 +00:00
if(NOT TARGET sodium)
# Allow -D DOWNLOAD_SODIUM=FORCE to download without even checking for a local libsodium
option(DOWNLOAD_SODIUM "Allow libsodium to be downloaded and built locally if not found on the system" OFF)
if(NOT DOWNLOAD_SODIUM STREQUAL "FORCE" AND NOT BUILD_STATIC_DEPS)
pkg_check_modules(SODIUM libsodium>=1.0.18 IMPORTED_TARGET)
endif()
move lokimq cmake code
2020-06-16 11:34:57 +00:00
remove FindSodium.cmake and use the cmake incantations from loki-core for setting sodium target up
2020-06-26 17:59:36 +00:00
add_library(sodium INTERFACE)
if(SODIUM_FOUND AND NOT DOWNLOAD_SODIUM STREQUAL "FORCE" AND NOT BUILD_STATIC_DEPS)
target_link_libraries(sodium INTERFACE PkgConfig::SODIUM)
else()
if(NOT DOWNLOAD_SODIUM AND NOT BUILD_STATIC_DEPS)
message(FATAL_ERROR "Could not find libsodium >= 1.0.18; either install it on your system or use -DDOWNLOAD_SODIUM=ON to download and build an internal copy")
endif()
message(STATUS "Sodium >= 1.0.18 not found, but DOWNLOAD_SODIUM specified, so downloading it")
include(DownloadLibSodium)
target_link_libraries(sodium INTERFACE sodium_vendor)
endif()
move sodium cmake target about so that it is detected earlier
2020-06-26 17:45:08 +00:00
remove FindSodium.cmake and use the cmake incantations from loki-core for setting sodium target up
2020-06-26 17:59:36 +00:00
# Need this target export so that loki-mq properly picks up sodium
export(TARGETS sodium NAMESPACE sodium:: FILE sodium-exports.cmake)
move sodium cmake target about so that it is detected earlier
2020-06-26 17:45:08 +00:00
endif()
loki-mq -> oxen-mq
2021-03-01 12:57:13 +00:00
option(FORCE_OXENMQ_SUBMODULE "force using oxenmq submodule" OFF)
if(NOT FORCE_OXENMQ_SUBMODULE)
Bump required oxenmq version Current lokinet dev relies on something from oxenmq dev branch which is in the not-yet-released next version; without this lokinet tries using the system 1.2.3 install, which then fails the build.
2021-02-25 16:54:18 +00:00
pkg_check_modules(OXENMQ liboxenmq>=1.2.4)
move lokimq cmake code
2020-06-16 11:34:57 +00:00
endif()
loki-mq -> oxen-mq
2021-03-01 12:57:13 +00:00
if(OXENMQ_FOUND)
nodedb refactor * bump zmq static dep * lokimq -> oxenmq * llarp_nodedb -> llarp::NodeDB * remove all crufty api parts of NodeDB * make NodeDB rc selection api not suck * make path builder api not suck * propagate all above changes so that unit tests work and it all compiles
2021-02-02 14:35:40 +00:00
add_library(oxenmq INTERFACE)
loki-mq -> oxen-mq
2021-03-01 12:57:13 +00:00
link_dep_libs(oxenmq INTERFACE "${OXENMQ_LIBRARY_DIRS}" ${OXENMQ_LIBRARIES})
target_include_directories(oxenmq INTERFACE ${OXENMQ_INCLUDE_DIRS})
nodedb refactor * bump zmq static dep * lokimq -> oxenmq * llarp_nodedb -> llarp::NodeDB * remove all crufty api parts of NodeDB * make NodeDB rc selection api not suck * make path builder api not suck * propagate all above changes so that unit tests work and it all compiles
2021-02-02 14:35:40 +00:00
add_library(oxenmq::oxenmq ALIAS oxenmq)
loki-mq -> oxen-mq
2021-03-01 12:57:13 +00:00
message(STATUS "Found system liboxenmq ${OXENMQ_VERSION}")
move lokimq cmake code
2020-06-16 11:34:57 +00:00
else()
nodedb refactor * bump zmq static dep * lokimq -> oxenmq * llarp_nodedb -> llarp::NodeDB * remove all crufty api parts of NodeDB * make NodeDB rc selection api not suck * make path builder api not suck * propagate all above changes so that unit tests work and it all compiles
2021-02-02 14:35:40 +00:00
message(STATUS "using oxenmq submodule")
loki-mq -> oxen-mq
2021-03-01 12:57:13 +00:00
add_subdirectory(${CMAKE_SOURCE_DIR}/external/oxen-mq)
move lokimq cmake code
2020-06-16 11:34:57 +00:00
endif()
make that a universal rule
2019-10-17 04:14:03 +00:00
# this is messing with release builds
add_compile_options(-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
if (NOT CMAKE_SYSTEM_NAME MATCHES "Linux" AND SHADOW)
static link windows unconditionally
2019-01-19 03:20:24 +00:00
message( FATAL_ERROR "shadow-framework is Linux only" )
Fix ASAN build
2019-05-18 15:34:03 +00:00
endif()
Enable more sanitisers
2019-09-22 14:32:03 +00:00
if(XSAN)
don't recover from sanitizer errors
2020-05-22 14:22:27 +00:00
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -fsanitize=${XSAN} -fno-omit-frame-pointer -fno-sanitize-recover")
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
foreach(type EXE MODULE SHARED STATIC)
don't recover from sanitizer errors
2020-05-22 14:22:27 +00:00
string(APPEND CMAKE_${type}_LINKER_FLAGS_DEBUG " -fsanitize=${XSAN} -fno-omit-frame-pointer -fno-sanitize-recover")
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endforeach()
Bump XSAN build to bionic and add status message
2020-02-24 17:40:38 +00:00
message(STATUS "Doing a ${XSAN} sanitizer build")
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endif()
Fix ASAN build
2019-05-18 15:34:03 +00:00
if(CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]")
add_definitions(-DLOKINET_DEBUG=1)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endif()
Fix ASAN build
2019-05-18 15:34:03 +00:00
disable shell hooks by default
2019-07-12 13:06:59 +00:00
if(WITH_SHELLHOOKS)
add_definitions(-DENABLE_SHELLHOOKS)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endif()
Partial fixes for shadow
2019-08-26 23:10:48 +00:00
Merge remote-tracking branch 'upstream/dev' into multithreaded-cryptography
2019-10-07 10:08:47 +00:00
if(TRACY_ROOT)
include_directories(${TRACY_ROOT})
add_definitions(-DTRACY_ENABLE)
endif()
Make nlohmann::json part of the build
2019-03-02 02:01:04 +00:00
port abseil-cpp to Solaris 2.x and legacy compiler fuck oracle with a rusty knife, we only support compilers with a full implementation of G++ (so, basically, only clang)
2019-03-24 00:54:25 +00:00
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wno-unknown-warning-option)
endif()
Allow builds on MSVC (#518) * Import cxxopts to replace getopts usage * Add visual studio build things * Fixup abseil build parts * Replace __attribute__((unused)) with ABSL_ATTRIBUTE_UNUSED * Fixup minor windows build issues * Replace getopts usage * Temporarily fixup .rc files * More minor windows fixes * Get a working build * Revert .rc files * Revert changes to nodedb
2019-04-19 18:24:33 +00:00
if (NOT MSVC_VERSION)
Disallow evil compilation -fpermissive allows nasty things that are (apparently) needed on Windows, so only enable it there. vla are evil, so don't just warn but error on it. remove duplicate -Wno-unknown-pragmas
2021-03-02 00:04:05 +00:00
add_compile_options(-Wall -Wextra -Wno-unknown-pragmas)
# vla are evil
add_compile_options(-Werror=vla)
add_compile_options(-Wno-unused-function -Wno-deprecated-declarations)
Allow builds on MSVC (#518) * Import cxxopts to replace getopts usage * Add visual studio build things * Fixup abseil build parts * Replace __attribute__((unused)) with ABSL_ATTRIBUTE_UNUSED * Fixup minor windows build issues * Replace getopts usage * Temporarily fixup .rc files * More minor windows fixes * Get a working build * Revert .rc files * Revert changes to nodedb
2019-04-19 18:24:33 +00:00
endif()
fix cxx flags
2018-09-07 20:54:50 +00:00
More work on router docker image - Multi-stage docker build (final image only 15MB!) - Build in release mode - Fix bug with release mode - Fix compiler being dumb AF - Disable FORTIFY for now - Enable LTO when making a staticly linked release - Fix some gcc specific warnings - Refactor cmake stuff into multiple files
2019-04-28 15:57:41 +00:00
include(cmake/coverage.cmake)
Add flag to generate coverage data
2019-01-12 01:19:24 +00:00
>make this a native app this will be packed up by the inno-setup installer script already cleaned up CMakeLists make it more readable exposed (nearly?) all of the configurable options
2018-12-12 04:51:22 +00:00
# these vars are set by the cmake toolchain spec
fix windows build
2018-09-25 08:31:29 +00:00
if (WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE)
Refactor top level cmake file into multiple components
2019-04-29 23:48:43 +00:00
include(cmake/cross_compile.cmake)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endif()
make clang happy, disable netns by default (for now)
2018-11-19 13:39:35 +00:00
Remove DEBIAN option This hasn't been used in a long time; the debian packaging lives in separate branches instead.
2020-05-17 22:21:00 +00:00
if(NATIVE_BUILD)
Use -mcpu=native on ppc64le
2020-02-07 04:22:27 +00:00
if(CMAKE_SYSTEM_PROCESSOR STREQUAL ppc64le)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
add_compile_options(-mcpu=native -mtune=native)
Use -mcpu=native on ppc64le
2020-02-07 04:22:27 +00:00
else()
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
add_compile_options(-march=native -mtune=native)
Use -mcpu=native on ppc64le
2020-02-07 04:22:27 +00:00
endif()
IX86 builds should only require SSE3, and this still allows debian release mgr to override the target selection flag
2019-12-31 15:12:17 +00:00
elseif(NOT NON_PC_TARGET)
get rid of NON_PC_TARGET
2019-11-05 11:45:49 +00:00
if (USE_AVX2)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
add_compile_options(-march=haswell -mtune=haswell -mfpmath=sse)
get rid of NON_PC_TARGET
2019-11-05 11:45:49 +00:00
else()
# Public binary releases
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
add_compile_options(-march=nocona -mtune=haswell -mfpmath=sse)
restore crypto flags for binary builds
2019-10-30 20:55:12 +00:00
endif()
Refactor CMakeLists into distinct directories
2019-02-09 16:16:00 +00:00
endif()
>make this a native app this will be packed up by the inno-setup installer script already cleaned up CMakeLists make it more readable exposed (nearly?) all of the configurable options
2018-12-12 04:51:22 +00:00
Modernise CMake build - Bump to require version 3.7.0 - Change to use `add_compile_options` over manually appending to `CMAKE_C_FLAGS` or `CMAKE_CXX_FLAGS`. - Use CMake machinery to set expected C++ standard - Use CMake machinery to find flag(s) for pthread build
2018-10-28 18:57:04 +00:00
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
fix dns
2018-07-16 23:26:58 +00:00
make clang happy, disable netns by default (for now)
2018-11-19 13:39:35 +00:00
if(USE_NETNS)
add_definitions(-DNETNS=1)
else()
add_definitions(-DNETNS=0)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endif()
initial shadow test net
2018-06-06 17:02:57 +00:00
fix dht bug, probably, re-enable loopback testnet functionality
2018-10-21 14:19:49 +00:00
if(TESTNET)
add_definitions(-DTESTNET=1)
monotonic time and run testnet at 20% realtime
2020-01-23 12:59:51 +00:00
# 5 times slower than realtime
temp commit
2021-04-12 11:39:07 +00:00
# add_definitions(-DTESTNET_SPEED=5)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endif()
fix dht bug, probably, re-enable loopback testnet functionality
2018-10-21 14:19:49 +00:00
add shadow plugin
2018-06-06 12:59:15 +00:00
if(SHADOW)
More work on router docker image - Multi-stage docker build (final image only 15MB!) - Build in release mode - Fix bug with release mode - Fix compiler being dumb AF - Disable FORTIFY for now - Enable LTO when making a staticly linked release - Fix some gcc specific warnings - Refactor cmake stuff into multiple files
2019-04-28 15:57:41 +00:00
include(cmake/shadow.cmake)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endif()
* logging refactor to be concise * don't inline bencode * refactor initial start of dht code a bit
2018-06-01 17:47:37 +00:00
fix versiontag
2019-12-14 01:20:45 +00:00
unset(GIT_VERSION)
unset(GIT_VERSION_REAL)
if(NOT GIT_VERSION)
exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "rev-parse --short HEAD" OUTPUT_VARIABLE GIT_VERSION_UNSTRIP)
string(STRIP "${GIT_VERSION_UNSTRIP}" GIT_VERSION)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endif()
fix versiontag
2019-12-14 01:20:45 +00:00
string(REGEX REPLACE "^fatal.*$" nogit GIT_VERSION_REAL "${GIT_VERSION}")
move it more
2019-11-05 12:28:08 +00:00
static build flag for win/mac static builds in drone config
2020-06-17 00:36:18 +00:00
find_package(PkgConfig REQUIRED)
libunbound can now be built as a static dep
2020-06-15 22:44:59 +00:00
if (NOT BUILD_STATIC_DEPS)
pkg_check_modules(UNBOUND libunbound REQUIRED IMPORTED_TARGET)
add_library(libunbound INTERFACE)
target_link_libraries(libunbound INTERFACE PkgConfig::UNBOUND)
endif()
proper CMake finding and using of libunbound
2020-06-11 19:27:29 +00:00
CMake fixes: libuv static build, base_libs, shared lib install dir (#1431) * Update how we build libuv - Update submoduled libuv to latest stable (1.40.0) - Don't look for a system libuv if we're under BUILD_STATIC_DEPS - Add a libuv interface library rather than using globals - Make the windows build fall back to the submodule if not explicitly given a LIBUV_ROOT * Replace ${LIBS} global with `base_libs` interface This simplifies linking and include handling a bit. * Remove unneeded header * Add missing csignal header (This was previously being pulled in incredibly indirectly via some stuff that eventually includes some other stuff that eventually included uv.h) * Use GNUInstallDirs to get lib dir instead of hard-coding lib Fixes #1429
2020-10-28 22:26:43 +00:00
pkg_check_modules(SD libsystemd IMPORTED_TARGET)
proper CMake finding and using of libunbound
2020-06-11 19:27:29 +00:00
# Default WITH_SYSTEMD to true if we found it
option(WITH_SYSTEMD "enable systemd integration for sd_notify" ${SD_FOUND})
CMake fixes: libuv static build, base_libs, shared lib install dir (#1431) * Update how we build libuv - Update submoduled libuv to latest stable (1.40.0) - Don't look for a system libuv if we're under BUILD_STATIC_DEPS - Add a libuv interface library rather than using globals - Make the windows build fall back to the submodule if not explicitly given a LIBUV_ROOT * Replace ${LIBS} global with `base_libs` interface This simplifies linking and include handling a bit. * Remove unneeded header * Add missing csignal header (This was previously being pulled in incredibly indirectly via some stuff that eventually includes some other stuff that eventually included uv.h) * Use GNUInstallDirs to get lib dir instead of hard-coding lib Fixes #1429
2020-10-28 22:26:43 +00:00
# Base interface target where we set up global link libraries, definitions, includes, etc.
add_library(base_libs INTERFACE)
revive android build system (#1339) * it lives? * clean up * add readme and add x86_64 to abi filters * disable route poking on android * make it compile on android * it compiles!!111 * typofix * re-enable ccache for android
2020-09-22 19:04:15 +00:00
if(WITH_SYSTEMD AND (NOT ANDROID))
proper CMake finding and using of libunbound
2020-06-11 19:27:29 +00:00
if(NOT SD_FOUND)
message(FATAL_ERROR "libsystemd not found")
endif()
CMake fixes: libuv static build, base_libs, shared lib install dir (#1431) * Update how we build libuv - Update submoduled libuv to latest stable (1.40.0) - Don't look for a system libuv if we're under BUILD_STATIC_DEPS - Add a libuv interface library rather than using globals - Make the windows build fall back to the submodule if not explicitly given a LIBUV_ROOT * Replace ${LIBS} global with `base_libs` interface This simplifies linking and include handling a bit. * Remove unneeded header * Add missing csignal header (This was previously being pulled in incredibly indirectly via some stuff that eventually includes some other stuff that eventually included uv.h) * Use GNUInstallDirs to get lib dir instead of hard-coding lib Fixes #1429
2020-10-28 22:26:43 +00:00
target_link_libraries(base_libs INTERFACE PkgConfig::SD)
target_compile_definitions(base_libs INTERFACE WITH_SYSTEMD)
systemd is linux only
2020-02-25 21:42:07 +00:00
endif()
Switch abseil & nlohmann to submodules and update to latest stable Our current abseil won't build with gcc 10 (its `optional` implementation appears broken), and spews warnings under slightly older compilers; updating to the latest stable 2019 branch fixes both issues.
2020-02-13 17:42:16 +00:00
lokinet-bootstrap native binary
2021-04-15 17:39:45 +00:00
add_subdirectory(external)
Begin peer stats infrastructure
2020-05-20 17:26:45 +00:00
include_directories(SYSTEM external/sqlite_orm/include)
make android compile again
2018-11-06 14:06:09 +00:00
if(ANDROID)
CMake fixes: libuv static build, base_libs, shared lib install dir (#1431) * Update how we build libuv - Update submoduled libuv to latest stable (1.40.0) - Don't look for a system libuv if we're under BUILD_STATIC_DEPS - Add a libuv interface library rather than using globals - Make the windows build fall back to the submodule if not explicitly given a LIBUV_ROOT * Replace ${LIBS} global with `base_libs` interface This simplifies linking and include handling a bit. * Remove unneeded header * Add missing csignal header (This was previously being pulled in incredibly indirectly via some stuff that eventually includes some other stuff that eventually included uv.h) * Use GNUInstallDirs to get lib dir instead of hard-coding lib Fixes #1429
2020-10-28 22:26:43 +00:00
target_link_libraries(base_libs INTERFACE log)
target_compile_definitions(base_libs INTERFACE ANDROID)
add more android stuff
2019-04-08 14:27:55 +00:00
set(ANDROID_PLATFORM_SRC android/ifaddrs.c)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endif()
make clang happy, disable netns by default (for now)
2018-11-19 13:39:35 +00:00
tracy lock contention testing and other fun things
2019-09-03 15:56:56 +00:00
if(TRACY_ROOT)
CMake fixes: libuv static build, base_libs, shared lib install dir (#1431) * Update how we build libuv - Update submoduled libuv to latest stable (1.40.0) - Don't look for a system libuv if we're under BUILD_STATIC_DEPS - Add a libuv interface library rather than using globals - Make the windows build fall back to the submodule if not explicitly given a LIBUV_ROOT * Replace ${LIBS} global with `base_libs` interface This simplifies linking and include handling a bit. * Remove unneeded header * Add missing csignal header (This was previously being pulled in incredibly indirectly via some stuff that eventually includes some other stuff that eventually included uv.h) * Use GNUInstallDirs to get lib dir instead of hard-coding lib Fixes #1429
2020-10-28 22:26:43 +00:00
target_link_libraries(base_libs INTERFACE dl)
tracy lock contention testing and other fun things
2019-09-03 15:56:56 +00:00
endif()
try fixing issue number 17 (not done)
2019-06-24 15:51:58 +00:00
add build infra for toggling hive builds
2020-02-27 19:43:16 +00:00
if(WITH_HIVE)
add_definitions(-DLOKINET_HIVE=1)
endif()
Refactor CMakeLists into distinct directories
2019-02-09 16:16:00 +00:00
add_subdirectory(crypto)
add_subdirectory(llarp)
Split cmake files for executables into src dirs
2019-10-05 15:03:25 +00:00
add_subdirectory(daemon)
unscrew travis-ci (#1223) * update travis ci clang-format to clang-format-9 because we use that now add python3-dev package becuase something inside ci thinks it has python but really does not * try using python3.6 * try working around hot garbage that is travis-ci * add deadsnakes repo for python3.8 * prevent nullptr deference when running in unit tests * move python3.8 to main dependancy matrix and add python3.8 to homebrew deps * add deadsnake apt repo * add deadsnakes and python3.8 back to previous matrix * dev package for python * toggle hive build in ci * dont add pybind11 if not bulding hive * revert setting pyenv shim for travis ci * make native builds on by default except for windows ci * only apply native build being off for windows release target becuase that broke macos
2020-04-18 19:58:41 +00:00
if(WITH_HIVE)
add_subdirectory(pybind)
endif()
initial pybind11 introspection code
2020-01-17 13:22:08 +00:00
Refactor CMakeLists into distinct directories
2019-02-09 16:16:00 +00:00
Try building tests on windows
2019-07-17 09:08:04 +00:00
if (NOT SHADOW)
hive pytest framework in place (and path build test works)!
2020-03-03 04:15:18 +00:00
if(WITH_TESTS OR WITH_HIVE)
get rid of NON_PC_TARGET
2019-11-05 11:45:49 +00:00
add_subdirectory(test)
endif()
add android target
2018-08-05 23:48:59 +00:00
if(ANDROID)
Merge remote-tracking branch 'upstream/dev' into vpn-api-2019-10-03
2019-10-21 12:01:29 +00:00
add_subdirectory(jni)
cmake refactor Refactors many things in cmake to improve and simplify: - don't use variable indirection for target names; target names are *already* a variable of sorts. (e.g. ${UTIL_LIB} is now just lokinet-util). cmake/basic_definitions.cmake is now gone. - fix LTO enabling to use the standard cmake (3.9+) LTO mechanism rather than shoving a bunch of flag hacks through link_libraries and add_compile_options. This also now enables LTO when building a shared library (because previously the -flto hacks were only turned on in the static code for some reason). - build liblokinet as *either* shared library or static library, but not both. Building both makes things more complicated because they had different names (lokinet-shared or lokinet-static) and seems pointless: you generally want one or the other. Now there is just the liblokinet target, which will be shared or static depending on the value of BUILD_SHARED_LIBS. - Simplify lokinet-cryptography AVX2 code: just build *one* library, and add in the additional AVX2 files when possible, rather than building two and needing to merge them. - Compress STATIC_LINK and STATIC_LINK_RUNTIME into just STATIC_LINK. It makes no sense to use one of these (_RUNTIME) on Windows and the other on non-Windows when they appear to try to do the same thing. - remove a bunch of annotations from `endif(FOO)` -> `endif()`. - move all the tuntap compilation code (including OS-specific source file selection) into vendor/CMakeLists.txt and build tuntap as an intermediate OBJECT library rather than keeping a global variable in 5 different files. - move release motto define to root cmake; it made no sense being duplicated in both unix.cmake and win32.cmake - fix add_log_tag to not stomp on any existing source compile flags with its definition. Also use proper compile definition property instead of cramming it into compile flags. - make optimization/linker flags less hacky. There's no reason for us to force particular optimization flags because the cmake build type already does that (e.g. -DCMAKE_BUILD_TYPE=Release does -O3). Not doing that also silences a bunch of cmake warnings because it thinks "-O0 -g3" etc. are link libraries (which is reasonable: that's what the code was telling cmake they are). - sets the default build type to RelWithDebInfo which gives us `-O2 -g` if you don't specify a build type. - Move PIC up (so that the things loaded in unix.cmake, notably libuv, have it set). - Add a custom `curl` interface library that carries the correct link target and include paths for curl (system or bundled).
2020-05-17 19:41:48 +00:00
endif()
Refactor CMakeLists into distinct directories
2019-02-09 16:16:00 +00:00
endif()
cpack win32
2020-01-10 19:59:45 +00:00
more docs, make doxygen work
2020-03-27 15:04:13 +00:00
add_subdirectory(docs)
add uninstall target (#1340) * add uninstall target * * redo cmake uninstall * remove lokinet-vpn python script * don't install lokinet-vpn twice
2020-09-09 16:06:57 +00:00
# uninstall target
if(NOT TARGET uninstall)
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
add_custom_target(uninstall
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
endif()
Add -DBUILD_PACKAGE=ON to make cpack code opt-in
2020-04-18 21:50:07 +00:00
if(BUILD_PACKAGE)
include(cmake/installer.cmake)
endif()
Reference in New Issue Copy Permalink