X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=fedf931f041b3f687aa6493631e848553e500e72;hb=e26c81f;hp=ae710077bbbaac70d2fb7efd271bc3bf7570d67f;hpb=917dc3b39dca1ddd0b268076d02cf15cf3e3de0c;p=vpp.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ae710077bbb..fedf931f041 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,11 +16,22 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 project(vpp C)
 
 include(CheckCCompilerFlag)
-
 include(cmake/message.cmake)
 include(cmake/cpu.cmake)
 include(cmake/ccache.cmake)
 
+##############################################################################
+# VPP Version
+##############################################################################
+execute_process(
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  COMMAND scripts/version
+  OUTPUT_VARIABLE VPP_VERSION
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+string(REPLACE "-" ";" VPP_LIB_VERSION ${VPP_VERSION})
+list(GET VPP_LIB_VERSION 0 VPP_LIB_VERSION)
+
 ##############################################################################
 # build config
 ##############################################################################
@@ -30,16 +41,17 @@ set(CMAKE_C_FLAGS_COMMON "-DFORTIFY_SOURCE=2 -fstack-protector-all -Werror")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${CMAKE_C_FLAGS_COMMON} -DCLIB_DEBUG")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_FLAGS_COMMON}")
 
+check_c_compiler_flag("-Wno-address-of-packed-member" compiler_flag_no_address_of_packed_member)
+if (compiler_flag_no_address_of_packed_member)
+  add_definitions(-Wno-address-of-packed-member)
+endif()
+
 ##############################################################################
 # install config
 ##############################################################################
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${VPP_LIB_DIR_NAME}")
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 set(CMAKE_INSTALL_MESSAGE NEVER)
 
-message(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
-message(STATUS "We are on a ${CMAKE_SYSTEM_NAME} system")
-message(STATUS "The host processor is ${CMAKE_HOST_SYSTEM_PROCESSOR}")
-
 include_directories (
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_BINARY_DIR}
@@ -49,19 +61,70 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "vpp")
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
-find_package(OpenSSL REQUIRED)
 
 include(cmake/memfd.cmake)
 include(cmake/api.cmake)
 include(cmake/library.cmake)
 include(cmake/exec.cmake)
 include(cmake/plugin.cmake)
-include(cmake/deb.cmake)
 
 ##############################################################################
-# subdirs
+# subdirs - order matters
 ##############################################################################
-foreach (DIR vppinfra svm vlib vlibmemory vlibapi vnet vpp vat vcl plugins vpp-api)
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+  find_package(OpenSSL REQUIRED)
+  set(SUBDIRS
+    vppinfra svm vlib vlibmemory vlibapi vnet vpp vat vcl plugins
+    vpp-api tools/vppapigen tools/g2 tools/elftool tools/perftool cmake
+  )
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+  set(SUBDIRS vppinfra)
+else()
+  message(FATAL_ERROR "Unsupported system: ${CMAKE_SYSTEM_NAME}")
+endif()
+
+foreach(DIR ${SUBDIRS})
   add_subdirectory(${DIR})
-endforeach ()
+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(
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  COMMAND git rev-parse --show-toplevel
+  OUTPUT_VARIABLE VPP_GIT_TOPLEVEL_DIR
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+if (VPP_GIT_TOPLEVEL_DIR)
+  set_property(
+    DIRECTORY APPEND PROPERTY
+    CMAKE_CONFIGURE_DEPENDS ${VPP_GIT_TOPLEVEL_DIR}/.git/index
+  )
+endif()
+
+##############################################################################
+# print configuration
+##############################################################################
+message(STATUS "Configuration:")
+pr("VPP version" "${VPP_VERSION}")
+pr("VPP library version" "${VPP_LIB_VERSION}")
+pr("GIT toplevel dir" "${VPP_GIT_TOPLEVEL_DIR}")
+pr("C flags" "${CMAKE_C_FLAGS}")
+pr("Linker flags" "${CMAKE_LINKER_FLAGS}")
+pr("Target processor" "${CMAKE_SYSTEM_PROCESSOR}")
+pr("Build type" "${CMAKE_BUILD_TYPE}")
+pr("Prefix path" "${CMAKE_PREFIX_PATH}")
+pr("Install prefix" "${CMAKE_INSTALL_PREFIX}")