Commit Graph

133 Commits

Author SHA1 Message Date
Jeff Becker
a6d17dcd16
add WITH_LTO option to disble lto on compile time 2020-05-20 19:29:49 -04:00
Jason Rhinelander
b4fce0e3ee curl: use ccache; disabled lots of other crap
brotli and libpsl both got autodetected on my system, so explicitly
disable them (and a bunch of other crap from --configure).

Build with ccache.
2020-05-17 23:31:41 -03:00
Jason Rhinelander
fa794e64cd Build libsodium with ccache and fPIC
fPIC is needed in case we are building a shared liblokinet (within which
we want the static libsodium).
2020-05-17 23:31:41 -03:00
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).
2020-05-17 23:31:23 -03:00
Jeff Becker
64157d5d44 track libcurl and libuv with cmake, add libuv submodule 2020-05-17 14:53:28 -03:00
Jeff Becker
abc1f67430
check for std::optional as macos can be broke af sometimes 2020-05-15 09:40:24 -04:00
Jeff Becker
5a24d2deef
add check for std::filesystem 2020-05-15 09:32:24 -04:00
cathugger
0bb43d98c7
fix GenVersion.cmake
* rev-parse --short without any argument defaults to 8 chars
* truncation is absolutely moot here
* rev-list --abbrev-commit also uses 8 chars by default

because of length mismatch (COMMIT - 9 chars, TAGGEDCOMMIT - 8 chars) it always was mismatching them even when it should've been detecting that it's at release tag.
cut out explicit lengths and leave everything to use defaults, because they work (they both rely on the same core.abbrev setting so no length mismatch should happen).
2020-05-06 14:26:15 +00:00
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.
2020-05-01 17:43:27 -03:00
Jeff Becker
783e72da73
fix ci for win32 2020-04-22 12:55:05 -04:00
Stephen Shelton
67f023cf8a
Use install(PROGRAMS... instead of isntall(FILES... 2020-04-21 17:37:10 -06:00
Jason Rhinelander
3048ccf3f8 Set -mmacosx-version-min the cmake way 2020-04-21 20:01:24 -03:00
Jeff
edc0d1a3ed
Merge pull request #1225 from majestrate/macos-cpack-setup-and-bootstrap-2020-04-10
macos cpack installer infra
2020-04-21 14:50:16 -04:00
Stephen Shelton
0b1c57f650 Include macos uninstall script 2020-04-21 00:28:27 -03:00
Jason Rhinelander
9f208d2b6c Pass CMAKE_PREFIX_PATH through to lokinet-gui
Needed to build against the right Qt
2020-04-20 21:51:01 -03:00
Rick V
96fc3cdd55
fix pybind 2020-04-20 19:09:21 -05:00
Jason Rhinelander
216b807cb3 Notarize has an "a" in it 2020-04-20 00:28:32 -03:00
Jason Rhinelander
8d74407d11 codesigning and notarization
Codesigns and notarizes the package.  Requires a bunch of stuff to
actually get this working.  (see contrib/macos-signing.txt).

I'm currently also building with

    -DLOKINET_GUI_REPO=https://github.com/jagerman/loki-network-control-panel.git -DLOKINET_GUI_CHECKOUT=cmake

because it needs the camke-ification PR for the control panel to
properly sign everything there.
2020-04-19 23:18:48 -03:00
Jason Rhinelander
0032f1fdde Add simple installer readme 2020-04-19 23:18:48 -03:00
Jason Rhinelander
daf0174e53 Change mac install prefix to /opt/lokinet
/usr/local is probably going to get stomped on by homebrew.
2020-04-19 23:18:48 -03:00
Jason Rhinelander
93311fbc99 Build lokinet-gui with ExternalProject
Also installs it without the extra hack by specifying ../../Applications
for the destination.  (This definitely feels kind of nasty, but it works).
2020-04-19 23:16:23 -03:00
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.
2020-04-19 23:16:23 -03:00
Stephen Shelton
c20d5b186d Bundle gui in mac installer 2020-04-19 23:16:23 -03:00
Stephen Shelton
dd3121d8ac MacOS installer / runtime nonsense 2020-04-19 23:16:23 -03:00
Jeff Becker
31f74b5ffb macos post install script that bootstraps, generates configs and registers plist 2020-04-19 23:16:23 -03:00
Jeff Becker
c36b6a409c
move version to cmake so docs can access it 2020-04-07 13:16:22 -04:00
Jeff Becker
3e7acb72e1
more docs, make doxygen work 2020-04-07 13:16:22 -04:00
Jeff Becker
7455a1956d
make apple builds build for older versions and embrace the bitrot 2020-04-06 08:44:35 -04:00
Jeff Becker
9428689939
fix up cpack for macos 2020-04-03 10:14:19 -04:00
Jeff Becker
aae260fbea
more macos installer bits 2020-04-02 11:53:14 -04:00
Jeff Becker
3b26b8b24d
make gitlab pump out 32 bit installers, no lto for builds as that is cursed for now. 2020-04-02 11:08:08 -04:00
Jeff Becker
9e696e131e
make installer pull in tuntap driver 2020-04-02 11:08:07 -04:00
Jeff Becker
f335aaa847
set license 2020-04-02 11:08:07 -04:00
Jeff Becker
2190da8c81
cpack win32 2020-04-02 11:08:07 -04:00
Jason Rhinelander
3b0927ce13
Merge pull request #1140 from despair86/cmake-cleanup
some light cmake cleanup for win32
2020-03-04 11:44:10 -04:00
Rick V
3ca50b3619
missing branch on option 2020-03-03 15:33:12 -06:00
Rick V
d22af469a4
some win32 cmake cleanup
also removes MSVC rules (we don't support MSVC)
2020-03-03 15:33:11 -06:00
Rick V
dbc559d4ff
finally fix cross-LTO on windows builds 2020-03-03 15:33:10 -06:00
Rick V
4cd7a22ca3
fix libsodium cross compile 2020-03-03 15:33:04 -06:00
Jeff Becker
0a6c91b26c
operator presidence 2020-03-03 06:54:21 -05:00
Jeff Becker
d44a96769a
allow building from source tarballs 2020-03-03 06:54:21 -05:00
despair
8a27e3972d
we need XPG7 on netbsd 2020-02-25 15:48:53 -06:00
Jason Rhinelander
7ab6220a41 Older cmake workaround 2020-02-06 17:13:57 -04:00
Jason Rhinelander
5a4700d868 Use ExternalProject to build downloaded libsodium 2020-02-06 16:27:51 -04:00
Jason Rhinelander
73239f4c39 Use glob to find sodium source files
Manually changing the list every time we want to change the libsodium
version is painful.

I tested this glob against libsodium 1.0.17 and verified it produces the
same set of files (aside from the generated version.h), and that in
1.0.18 it produces the same set modulo upstream files removed/added.
2020-02-02 22:12:29 -04:00
Jason Rhinelander
b72a4296b7 Fix libsodium 1.0.18 URL 2020-02-02 21:37:09 -04:00
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.
2020-02-02 16:38:48 -04:00
Jeff Becker
da5eb913e9
use proper cmake call 2020-01-07 18:14:26 -05:00
Jeff Becker
fde0ca374f
i hate curl 2020-01-07 18:14:25 -05:00
Jeff Becker
336a748695
make it build in normal mode too 2020-01-07 18:14:25 -05:00