Commit Graph

536 Commits (1884d17e9dcc09c49aed0ad68ca3f3c1a2d629be)

Author SHA1 Message Date
Jason Rhinelander 5b7d194ff1 Merge remote-tracking branch 'origin/master' into dev 4 years ago
Jason Rhinelander 11342b1d9f Remove travis-ci
We don't have much left there that works -- the one useful build (s390x)
errors out with a no available disk space error, so just give up on it.
4 years ago
Jason Rhinelander be9ddf2ae1 Bring back ghc::filesystem for broke AF macos
macOS doesn't provide `<filesystem>` support when targetting anything
earlier than 10.15.
4 years ago
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 ab4ee954b9 Remove DEBIAN option
This hasn't been used in a long time; the debian packaging lives in
separate branches instead.
4 years ago
Jason Rhinelander a45bec7c4f Removed RPI definition
This was a long-obsolete fix for things that don't matter anymore.
4 years ago
Jeff Becker 64157d5d44 track libcurl and libuv with cmake, add libuv submodule 4 years ago
Jeff Becker 39b32a9ccc
move check for std::filesystem and std::optional down 4 years ago
Jeff Becker abc1f67430
check for std::optional as macos can be broke af sometimes 4 years ago
Jeff Becker 1072d9b505
detect travis using environmental vars 4 years ago
Jeff Becker a7d616843f
add shitty check for running in travis with workarounds because god is dead and travis-ci fucking sucks. 4 years ago
Jason Rhinelander 1697bf90fe C++17
Compiles with C++17, replaces ghc::filesystem with std::filesystem,
nonstd::optional with std::optional, and llarp::string_view with
std::string_view.
4 years ago
Jeff 0048badcf9
Merge pull request #1241 from jagerman/fix-systemd
No LINUX variable in cmake
4 years ago
Jason Rhinelander 6080a9427b No LINUX variable in cmake
Just let the pkg_check fail when libsystemd isn't install; it shouldn't
hurt anything.
4 years ago
Jason Rhinelander d8858361f4 No LINUX variable in cmake
Just let the pkg_check fail when libsystemd isn't install; it shouldn't
hurt anything.
4 years ago
Jason Rhinelander 3048ccf3f8 Set -mmacosx-version-min the cmake way 4 years ago
Jason Rhinelander 053a5cb180 Set -mmacosx-version-min the cmake way 4 years ago
Jason Rhinelander a75015bc64 Disable thread safety annotations on AppleClang 4 years ago
Jason Rhinelander b2bd555965 Bump version to 0.7.1
Including mostly windows/macos packaging changes, plus a few minor
fixes.
4 years ago
Jason Rhinelander 44b6ccebbd 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).
4 years ago
Jason Rhinelander 16d2296b11 Add -DBUILD_PACKAGE=ON to make cpack code opt-in 4 years ago
Jason Rhinelander 58133db753 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.
4 years ago
Jeff Becker 73eef0427a move cmake unix down 4 years ago
Jeff Becker dbaed61100 make gitlab pump out 32 bit installers, no lto for builds as that is cursed for now. 4 years ago
Jeff Becker 7406dbc964 cpack win32 4 years ago
Jason Rhinelander f8209baf50 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).
4 years ago
Jason Rhinelander ebb1950941 Add -DBUILD_PACKAGE=ON to make cpack code opt-in 4 years ago
Jason Rhinelander 3dd3d48fbb 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.
4 years ago
Jeff 5b1941222b
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
4 years ago
Jason Rhinelander 3c6aa002b8 Fix errors and warnings compiling on mac 4 years ago
Jeff Becker 3e7acb72e1
more docs, make doxygen work 4 years ago
Jeff d3091cf9fc
Merge pull request #1167 from tewinget/tooling
RouterHive initial PR
4 years ago
Jeff Becker a02363325e
move cmake unix down 4 years ago
Jeff Becker 3b26b8b24d
make gitlab pump out 32 bit installers, no lto for builds as that is cursed for now. 4 years ago
Jeff Becker 2190da8c81
cpack win32 4 years ago
Thomas Winget 138a0b33fb jason's computer can't python3 4 years ago
Thomas Winget 771d0b4489 hive pytest framework in place (and path build test works)! 4 years ago
Jeff Becker a4141617d7 add build infra for toggling hive builds 4 years ago
Jeff Becker 1fdb8b4c94 initial pybind11 introspection code 4 years ago
Rick V c8c9222b01
remove unused rule 4 years ago
Rick V c4e8e52fcc
finally remove C++17 requirement on windows (only needed it for
filesystem)
4 years ago
Rick V dbc559d4ff
finally fix cross-LTO on windows builds 4 years ago
Jason Rhinelander 7a5b105f49 Remove enable_testing() because ctest sucks (and thus we don't use it) 4 years ago
Jason Rhinelander 53c85ebf1d if(LINUX) doesn't work; just try to find libsystemd gently instead 4 years ago
Jason Rhinelander 54236cde9d
Merge pull request #1136 from jagerman/fix-cmake-linux-var
Fix cmake LINUX variable around systemd enabling
4 years ago
Jason Rhinelander b87adab438 Fix cmake LINUX variable around systemd enabling 4 years ago
Jason Rhinelander e3bce76a7c Add EXCLUDE_FROM_ALL to subprojects
Prevent `make install` from installing headers/cmake stuff.
4 years ago
Rick V 5295ada917
systemd is linux only 4 years ago
Jason Rhinelander 51ef8d69f8 Default libsystemd support to enabled if found
WITH_SYSTEMD=ON or =OFF works to explicitly enable/disable, but if
omitted the default is now ON if found and OFF if you don't.
4 years ago
Jason Rhinelander 3be0766f27 Bump XSAN build to bionic and add status message 4 years ago