Commit Graph

18 Commits (c5faa8692643e970851a52c710365facf0203587)

Author SHA1 Message Date
Jason Rhinelander c5faa86926 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).
4 years ago
Jason Rhinelander 74cc73d46b DOWNLOAD_SODIUM=FORCE to always download libsodium
This bypasses the check for a compatible local libsodium.
4 years ago
Jason Rhinelander 2b93ccb393 Bump libsodium required version to 1.0.18
We use crypto_core_ed25519_scalar_mul which is only exported by
libsodium >= 1.0.18.
4 years ago
Jason Rhinelander 6069b726e1 Fix ntru avx2 compilation when DOWNLOAD_SODIUM
We don't explicitly have to link against it, but it doesn't hurt *and*
this also pulls in the proper sodium include path, which we do need.
4 years ago
Jason Rhinelander 210cb837c6 Enable -avx2 -fma for ntru even when compiling without AVX2 support
This code is runtime guarded with CPU feature tests, so even if we are
making a non-AVX2 build we still want to compile the avx code path with
-mavx2 -mfma so that it can be opportunistically used when run on
AVX2-supporting CPUs (particularly for the debs and release binaries).
4 years ago
Jason Rhinelander 54b644e280 Add -DDOWNLOAD_SODIUM to re-enabled dl&build of sodium
Also supported in the Makefile (e.g. `make DOWNLOAD_SODIUM=ON`)

Also DRYs out the Makefile a little.
5 years ago
Jeff Becker 30a8bb681f
more 5 years ago
Jeff Becker 31150fa4d0
require version 5 years ago
Jason Rhinelander 57ccb1fd5c Move sodium download into separate cmake include 5 years ago
Jeff Becker c1a81d26f1
pull in libsodium if local version sucks 5 years ago
Rick V d02d4ac044
remove vendored libsodium 5 years ago
Jeff 49b410b437
Merge pull request #888 from majestrate/fix-broken-build-2019-10-30
fix typo in cmake
5 years ago
Jason Rhinelander 0774213e87 Fix cmake sodium version check 5 years ago
Jeff Becker f228eca39e
fix typo 5 years ago
Jeff Becker 3ebea458e9
use vendored libsodium if we dont have a good version 5 years ago
Jeff Becker f38240f945
devendor libsodium by default except for android 5 years ago
Michael 90373b806c
Fix log tag after cmake changes 5 years ago
Michael 1aeacb0043
Refactor CMakeLists into distinct directories 5 years ago