diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-09-17 17:45:08 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-09-17 18:59:49 +0200 |
| commit | 4fa1694b0514042404ef7efa801addc2f624cf37 (patch) | |
| tree | e115edac6cfa85a47b5554eb1f018f345a18d2ad /CMakeLists.txt | |
| parent | c5be804725623977193aad459caf906f325c83bd (diff) | |
Github Actions integration
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b929ba87b..1a61af0a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,6 +107,10 @@ if(ENABLE_SANITIZER_THREAD) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined -fno-sanitize=alignment -fsanitize=enum -fsanitize=thread") endif() +if(NOT NDPI_WITH_GCRYPT) + set(NDPI_ADDITIONAL_ARGS "--disable-gcrypt") +endif() + if(STATIC_LIBNDPI_INSTALLDIR STREQUAL "" AND BUILD_NDPI) include(ExternalProject) ExternalProject_Add( @@ -117,6 +121,7 @@ if(STATIC_LIBNDPI_INSTALLDIR STREQUAL "" AND BUILD_NDPI) CFLAGS=${CMAKE_C_FLAGS} LDFLAGS=${CMAKE_MODULE_LINKER_FLAGS} CROSS_COMPILE_TRIPLET=${CROSS_COMPILE_TRIPLET} + ADDITIONAL_ARGS=${NDPI_ADDITIONAL_ARGS} MAKE_PROGRAM=make DEST_INSTALL=${CMAKE_BINARY_DIR}/libnDPI ${CMAKE_CURRENT_SOURCE_DIR}/scripts/get-and-build-libndpi.sh @@ -139,10 +144,6 @@ if(NOT STATIC_LIBNDPI_INSTALLDIR STREQUAL "" OR BUILD_NDPI OR NDPI_NO_PKGCONFIG) option(NDPI_WITH_PCRE "Link static libndpi library against libpcre." OFF) option(NDPI_WITH_MAXMINDDB "Link static libndpi library against libmaxminddb." OFF) - if(BUILD_NDPI AND NOT NDPI_WITH_GCRYPT) - message(FATAL_ERROR "BUILD_NDPI enabled, but NDPI_WITH_GCRYPT not. This will lead to unexpected test results.") - endif() - if(NDPI_WITH_GCRYPT) find_package(GCRYPT "1.4.2" REQUIRED) endif() @@ -176,6 +177,7 @@ else() endif() find_package(PCAP "1.8.1" REQUIRED) + target_compile_options(nDPId PRIVATE "-pthread") target_compile_definitions(nDPId PRIVATE -DGIT_VERSION=\"${GIT_VERSION}\" ${NDPID_DEFS} ${ZLIB_DEFS}) target_include_directories(nDPId PRIVATE |