mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-15 12:13:24 +00:00
c5faa86926
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).
91 lines
2.9 KiB
CMake
91 lines
2.9 KiB
CMake
if (WITH_HIVE)
|
|
add_custom_target(hive_build DEPENDS liblokinet pyllarp)
|
|
add_custom_target(hive ${CMAKE_COMMAND} -E
|
|
env PYTHONPATH="$ENV{PYTHONPATH}:${CMAKE_BINARY_DIR}/pybind"
|
|
${PYTHON_EXECUTABLE} -m pytest
|
|
${CMAKE_CURRENT_SOURCE_DIR}/hive
|
|
DEPENDS
|
|
hive_build)
|
|
endif()
|
|
|
|
# Old gtest-based tests; new tests should use Catch2, instead.
|
|
add_executable(testAll
|
|
# helpers
|
|
main.cpp
|
|
crypto/mock_crypto.cpp
|
|
dht/mock_context.cpp
|
|
test_util.cpp
|
|
# actual test cases
|
|
config/test_llarp_config_ini.cpp
|
|
crypto/test_llarp_crypto_types.cpp
|
|
crypto/test_llarp_crypto.cpp
|
|
crypto/test_llarp_key_manager.cpp
|
|
dht/test_llarp_dht_bucket.cpp
|
|
dht/test_llarp_dht_explorenetworkjob.cpp
|
|
dht/test_llarp_dht_kademlia.cpp
|
|
dht/test_llarp_dht_key.cpp
|
|
dht/test_llarp_dht_node.cpp
|
|
dht/test_llarp_dht_tx.cpp
|
|
dht/test_llarp_dht_txowner.cpp
|
|
dns/test_llarp_dns_dns.cpp
|
|
exit/test_llarp_exit_context.cpp
|
|
link/test_llarp_link.cpp
|
|
llarp_test.cpp
|
|
net/test_llarp_net.cpp
|
|
router/test_llarp_router_version.cpp
|
|
routing/llarp_routing_transfer_traffic.cpp
|
|
routing/test_llarp_routing_obtainexitmessage.cpp
|
|
service/test_llarp_service_address.cpp
|
|
service/test_llarp_service_identity.cpp
|
|
test_libabyss.cpp
|
|
test_llarp_encrypted_frame.cpp
|
|
test_llarp_router_contact.cpp
|
|
test_md5.cpp
|
|
util/meta/test_llarp_util_memfn.cpp
|
|
util/meta/test_llarp_util_traits.cpp
|
|
util/test_llarp_util_aligned.cpp
|
|
util/test_llarp_util_bencode.cpp
|
|
util/test_llarp_util_encode.cpp
|
|
util/test_llarp_util_log_level.cpp
|
|
util/thread/test_llarp_util_queue_manager.cpp
|
|
util/thread/test_llarp_util_queue.cpp
|
|
util/thread/test_llarp_util_thread_pool.cpp
|
|
)
|
|
|
|
target_link_libraries(testAll PUBLIC gmock gtest liblokinet)
|
|
target_include_directories(testAll PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
|
if(WIN32)
|
|
target_sources(testAll PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/win32/test.rc")
|
|
target_link_libraries(testAll PUBLIC ws2_32 iphlpapi shlwapi)
|
|
endif()
|
|
|
|
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
|
target_link_directories(testAll PRIVATE /usr/local/lib)
|
|
endif()
|
|
|
|
add_subdirectory(Catch2)
|
|
|
|
add_executable(catchAll
|
|
nodedb/test_nodedb.cpp
|
|
path/test_path.cpp
|
|
util/test_llarp_util_bits.cpp
|
|
util/test_llarp_util_printer.cpp
|
|
util/test_llarp_util_str.cpp
|
|
util/test_llarp_util_decaying_hashset.cpp
|
|
config/test_llarp_config_definition.cpp
|
|
config/test_llarp_config_output.cpp
|
|
net/test_ip_address.cpp
|
|
net/test_sock_addr.cpp
|
|
check_main.cpp)
|
|
|
|
target_link_libraries(catchAll PUBLIC liblokinet Catch2::Catch2)
|
|
target_include_directories(catchAll PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
|
# Custom targets to invoke the different test suites:
|
|
add_custom_target(catch COMMAND catchAll)
|
|
add_custom_target(rungtest COMMAND testAll)
|
|
|
|
# Add a custom "check" target that runs all the test suites:
|
|
add_custom_target(check DEPENDS rungtest catch)
|