diff options
| author |   Damjan Marion <damarion@cisco.com> | 2019-01-28 17:55:59 +0100 |
|---|---|---|
| committer |   Thomas F Herbert <therbert@redhat.com> | 2019-03-05 12:08:05 -0500 |
| commit | 3262adc55c2b39693a473e16593d07192d7cf916 (patch) | |
| tree | 9d32e1b541fa6c6affddafc6c0272b4299812e60 | |
| parent | d302022440a3698c7ec81340bfb67cab2a5b71ea (diff) | |
cmake: fix out-of-git-tree build
Cherry picked from master: 6077c97a
JIRA: VPP-1577
Change-Id: Ib94637ec09799c23f3179599b54a2be6e2768425
Signed-off-by: Damjan Marion <damarion@cisco.com>
| -rw-r--r-- | src/CMakeLists.txt | 11 | ||||
| -rwxr-xr-x | src/scripts/generate_version_h | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fedf931f041..3aae5cd2554 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -88,16 +88,6 @@ foreach(DIR ${SUBDIRS}) endforeach() ############################################################################## -# packaging -############################################################################## -include(cmake/pack.cmake) -add_vpp_packaging( - NAME "vpp" - VENDOR "fd.io" - DESCRIPTION "Vector Packet Processor" -) - -############################################################################## # detect if we are inside git repo and add configure dependency ############################################################################## execute_process( @@ -105,6 +95,7 @@ execute_process( COMMAND git rev-parse --show-toplevel OUTPUT_VARIABLE VPP_GIT_TOPLEVEL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET ) if (VPP_GIT_TOPLEVEL_DIR) diff --git a/src/scripts/generate_version_h b/src/scripts/generate_version_h index 993a682954b..f4705489c87 100755 --- a/src/scripts/generate_version_h +++ b/src/scripts/generate_version_h @@ -22,7 +22,7 @@ cat > ${1} << __EOF__ #define VPP_BUILD_DATE "$(date)" #define VPP_BUILD_USER "$(whoami)" #define VPP_BUILD_HOST "$(hostname)" -#define VPP_BUILD_TOPDIR "$(git rev-parse --show-toplevel)" +#define VPP_BUILD_TOPDIR "$(git rev-parse --show-toplevel 2> /dev/null)" #define VPP_BUILD_VER "$(scripts/version)" #endif __EOF__ |