X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=248d7b8d39edfd476368072172b879bf8821bca1;hb=da0e7497ca972f3219352d884b5c51e455503dbb;hp=b83d44e75679b186fd9b49025e3872440122a2cc;hpb=ff426930051664aee1638ccff23c3345b4c129e7;p=vpp.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b83d44e7567..248d7b8d39e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -84,7 +84,7 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "vpp") set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -include(cmake/memfd.cmake) +include(cmake/syscall.cmake) include(cmake/api.cmake) include(cmake/library.cmake) include(cmake/exec.cmake) @@ -98,6 +98,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") set(SUBDIRS vppinfra svm vlib vlibmemory vlibapi vnet vpp vat vcl plugins vpp-api tools/vppapigen tools/g2 tools/elftool tools/perftool cmake pkg + tools/appimage ) elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") set(SUBDIRS vppinfra) @@ -109,16 +110,6 @@ foreach(DIR ${SUBDIRS}) add_subdirectory(${DIR}) 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 ############################################################################## @@ -127,6 +118,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) @@ -150,4 +142,3 @@ pr("Host processor" "${CMAKE_HOST_SYSTEM_PROCESSOR}") pr("Target processor" "${CMAKE_SYSTEM_PROCESSOR}") pr("Prefix path" "${CMAKE_PREFIX_PATH}") pr("Install prefix" "${CMAKE_INSTALL_PREFIX}") -