scottk/nDPId
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/nDPId.git synced 2025-10-30 17:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed CMake warnings

Browse Source 
* `make dist`: improved libnDPI git version naming

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2024-11-20 12:05:03 +01:00
parent 7b91ad8458
commit 34f01b90e3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -211,15 +211,17 @@ add_dependencies(nDPId umask_check)
add_custom_target(dist) add_custom_target(dist)
add_custom_command( add_custom_command(
TARGET dist TARGET dist
PRE_BUILD
COMMAND "${CMAKE_SOURCE_DIR}/scripts/make-dist.sh" COMMAND "${CMAKE_SOURCE_DIR}/scripts/make-dist.sh"
) )
add_custom_target(daemon) add_custom_target(daemon)
add_custom_command( add_custom_command(
TARGET daemon TARGET daemon
POST_BUILD
COMMAND env nDPIsrvd_ARGS='-C 1024' "${CMAKE_SOURCE_DIR}/scripts/daemon.sh" "$<TARGET_FILE:nDPId>" "$<TARGET_FILE:nDPIsrvd>" COMMAND env nDPIsrvd_ARGS='-C 1024' "${CMAKE_SOURCE_DIR}/scripts/daemon.sh" "$<TARGET_FILE:nDPId>" "$<TARGET_FILE:nDPIsrvd>"
DEPENDS nDPId nDPIsrvd
) )
add_dependencies(daemon nDPId nDPIsrvd)
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

2
scripts/make-dist.sh
View File

@@ -19,7 +19,7 @@ fi
git submodule update --init ./libnDPI git submodule update --init ./libnDPI
NDPID_GIT_VERSION="$(git describe --tags || printf '%s' 'unknown')" NDPID_GIT_VERSION="$(git describe --tags || printf '%s' 'unknown')"
cd ./libnDPI && \ cd ./libnDPI && \
LIBNDPI_GIT_VERSION="$(git describe --tags || printf '%s' 'unknown')" && \ LIBNDPI_GIT_VERSION="$(git tag --list '[0-9].[0-9]' | tail -n1 || printf '%s' 'unknown')-$(git rev-parse --short HEAD)" && \
printf '%s\n' "Creating $(realpath ./libnDPI-${LIBNDPI_GIT_VERSION}.tar)" && \ printf '%s\n' "Creating $(realpath ./libnDPI-${LIBNDPI_GIT_VERSION}.tar)" && \
git archive --prefix="nDPId-${NDPID_GIT_VERSION}/libnDPI/" -o "../libnDPI-${LIBNDPI_GIT_VERSION}.tar" HEAD && \ git archive --prefix="nDPId-${NDPID_GIT_VERSION}/libnDPI/" -o "../libnDPI-${LIBNDPI_GIT_VERSION}.tar" HEAD && \
cd .. cd ..