X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=fedf931f041b3f687aa6493631e848553e500e72;hb=97748ca;hp=e6054e10ac4afa4f438982e82f18dca538062077;hpb=5ff0e0b1864fa646accea1ee344cbd8db07605fe;p=vpp.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e6054e10ac4..fedf931f041 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,60 +16,21 @@ 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)
 
 ##############################################################################
-# Highlight WARNING and ERROR messages
+# VPP Version
 ##############################################################################
-function(message)
-  list(GET ARGV 0 type)
-  string(ASCII 27 esc)
-  set(red "${esc}[1;31m")
-  set(yellow "${esc}[1;33m")
-  set(reset "${esc}[m")
-  if(type STREQUAL FATAL_ERROR OR type STREQUAL SEND_ERROR)
-    list(REMOVE_AT ARGV 0)
-    _message(${type} "${red}${ARGV}${reset}")
-  elseif(type STREQUAL WARNING)
-    list(REMOVE_AT ARGV 0)
-    _message(STATUS "${yellow}${ARGV}${reset}")
-  elseif(type STREQUAL STATUS)
-    list(REMOVE_AT ARGV 0)
-    _message(STATUS "${ARGV}")
-  else()
-    _message(${ARGV})
-  endif()
-endfunction()
-
-##############################################################################
-# CPU optimizations and multiarch support
-##############################################################################
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
-  set(CMAKE_C_FLAGS "-march=corei7 -mtune=corei7-avx ${CMAKE_C_FLAGS}")
-  check_c_compiler_flag("-march=core-avx2" AVX2)
-  if(AVX2)
-    list(APPEND MARCH_VARIANTS "avx2\;-march=core-avx2 -mtune=core-avx2")
-  endif()
-  check_c_compiler_flag("-march=skylake-avx512" AVX512)
-  if(AVX512)
-    list(APPEND MARCH_VARIANTS "avx512\;-march=skylake-avx512 -mtune=skylake-avx512")
-  endif()
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
-  set(CMAKE_C_FLAGS "-march=armv8-a+crc ${CMAKE_C_FLAGS}")
-endif()
-
-macro(vpp_library_set_multiarch_sources lib)
-  foreach(V ${MARCH_VARIANTS})
-    list(GET V 0 VARIANT)
-    list(GET V 1 VARIANT_FLAGS)
-    set(l ${lib}_${VARIANT})
-    add_library(${l} OBJECT ${ARGN})
-    set_target_properties(${l} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    target_compile_options(${l} PUBLIC "-DCLIB_MARCH_VARIANT=${VARIANT}")
-    separate_arguments(VARIANT_FLAGS)
-    target_compile_options(${l} PUBLIC ${VARIANT_FLAGS})
-    target_sources(${lib} PRIVATE $<TARGET_OBJECTS:${l}>)
-  endforeach()
-endmacro()
+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
@@ -80,21 +41,10 @@ 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}")
 
-##############################################################################
-# ccache
-##############################################################################
-option(VPP_USE_CCACHE "Use ccache compiler cache." ON)
-if(VPP_USE_CCACHE)
-  find_program(CCACHE_FOUND ccache)
-  message(STATUS "Looking for ccache")
-  if(CCACHE_FOUND)
-    message(STATUS "Looking for ccache - found")
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-  else(CCACHE_FOUND)
-    message(STATUS "Looking for ccache - not found")
-  endif(CCACHE_FOUND)
-endif(VPP_USE_CCACHE)
+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
@@ -102,10 +52,6 @@ endif(VPP_USE_CCACHE)
 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}
@@ -115,100 +61,70 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "vpp")
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
-find_package(OpenSSL REQUIRED)
-include_directories(${OPENSSL_INCLUDE_DIR})
 
-add_definitions(-DVPP_API_TEST_BUILTIN=1)
+include(cmake/memfd.cmake)
+include(cmake/api.cmake)
+include(cmake/library.cmake)
+include(cmake/exec.cmake)
+include(cmake/plugin.cmake)
 
 ##############################################################################
-# Check for memfd_create headers and libs
+# subdirs - order matters
 ##############################################################################
-check_c_source_compiles("
-  #define _GNU_SOURCE
-  #include <sys/mman.h>
-  int main() { return memfd_create (\"/dev/false\", 0); }
-" HAVE_MEMFD_CREATE)
-
-if (HAVE_MEMFD_CREATE)
-    add_definitions(-DHAVE_MEMFD_CREATE)
+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()
+
 ##############################################################################
-# API
+# packaging
 ##############################################################################
-function(vpp_generate_api_c_header file)
-  set (output_name ${CMAKE_CURRENT_BINARY_DIR}/${file}.h)
-  get_filename_component(output_dir ${output_name} DIRECTORY)
-  add_custom_command (OUTPUT ${output_name}
-    COMMAND mkdir -p ${output_dir}
-    COMMAND ${CMAKE_SOURCE_DIR}/tools/vppapigen/vppapigen
-    ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} --output ${output_name}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
-    COMMENT "Generating API header ${output_name}"
-  )
-endfunction()
-
-function(vpp_generate_api_json_header file)
-  set (output_name ${CMAKE_CURRENT_BINARY_DIR}/${file}.json)
-  get_filename_component(output_dir ${output_name} DIRECTORY)
-  add_custom_command (OUTPUT ${output_name}
-    COMMAND mkdir -p ${output_dir}
-    COMMAND ${CMAKE_SOURCE_DIR}/tools/vppapigen/vppapigen
-    ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} JSON --output ${output_name}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
-    COMMENT "Generating API header ${output_name}"
-  )
-endfunction()
-
-function(vpp_generate_api_header file)
-    vpp_generate_api_c_header (${file})
-    vpp_generate_api_json_header (${file})
-endfunction()
-
-function(vpp_add_api_files target)
-  unset(header_files)
-  foreach(file ${ARGN})
-    vpp_generate_api_header (${file})
-    list (APPEND header_files ${file}.h ${file}.json)
-  endforeach()
-  add_custom_target(${target} DEPENDS ${header_files})
-endfunction()
-
-add_custom_target(api_headers
-  DEPENDS vlibmemory_api_headers vnet_api_headers vpp_api_headers
+include(cmake/pack.cmake)
+add_vpp_packaging(
+  NAME "vpp"
+  VENDOR "fd.io"
+  DESCRIPTION "Vector Packet Processor"
 )
 
 ##############################################################################
-# header files
+# detect if we are inside git repo and add configure dependency
 ##############################################################################
-function (vpp_add_header_files path)
-  foreach(file ${ARGN})
-    get_filename_component(dir ${file} DIRECTORY)
-    install(FILES ${file} DESTINATION include/${path}/${dir})
-  endforeach()
-endfunction()
+execute_process(
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  COMMAND git rev-parse --show-toplevel
+  OUTPUT_VARIABLE VPP_GIT_TOPLEVEL_DIR
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 
-##############################################################################
-# subdirs
-##############################################################################
-foreach (DIR vppinfra svm vlib vlibmemory vnet vpp vpp-api vcl plugins)
-  add_subdirectory(${DIR})
-endforeach ()
+if (VPP_GIT_TOPLEVEL_DIR)
+  set_property(
+    DIRECTORY APPEND PROPERTY
+    CMAKE_CONFIGURE_DEPENDS ${VPP_GIT_TOPLEVEL_DIR}/.git/index
+  )
+endif()
 
 ##############################################################################
-# DEB Packaging
+# print configuration
 ##############################################################################
-set(CPACK_GENERATOR "DEB")
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "VPP Team")
-set(CPACK_PACKAGE_NAME "vpp")
-set(CPACK_PACKAGE_VENDOR "fd.io")
-set(CPACK_PACKAGE_VERSION "18.08")
-set(CPACK_DEB_COMPONENT_INSTALL ON)
-set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
-set(CPACK_DEBIAN_VPP_PACKAGE_NAME "vpp")
-set(CPACK_DEBIAN_VPP_FILE_NAME "vpp.deb")
-set(CPACK_DEBIAN_DEV_PACKAGE_NAME "vpp-dev")
-set(CPACK_DEBIAN_DEV_FILE_NAME "vpp-dev.deb")
-set(CPACK_DEBIAN_PLUGINS_PACKAGE_NAME "vpp-plugins")
-set(CPACK_DEBIAN_PLUGINS_FILE_NAME "vpp-plugins.deb")
-include(CPack)
+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}")
+