X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=8757053af64957b98c03fecc7c3e15d6bb85085a;hb=9514fab0423725fddcb0a4f5ec070ac8d2764ac8;hp=790d6a204777a36f5977dae32ed7cc08da6acb5a;hpb=2ddfe7524001270654c2027378b05f10e527eb5c;p=vpp.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 790d6a20477..8757053af64 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,59 +17,9 @@ project(vpp C)
 
 include(CheckCCompilerFlag)
 
-##############################################################################
-# Highlight WARNING and ERROR messages
-##############################################################################
-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()
+include(cmake/message.cmake)
+include(cmake/cpu.cmake)
+include(cmake/ccache.cmake)
 
 ##############################################################################
 # build config
@@ -80,26 +30,15 @@ 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
 ##############################################################################
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${VPP_LIB_DIR_NAME}")
 set(CMAKE_INSTALL_MESSAGE NEVER)
 
 message(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
@@ -116,69 +55,18 @@ 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(-DHAVE_MEMFD_CREATE -DVPP_API_TEST_BUILTIN=1)
-
-##############################################################################
-# API
-##############################################################################
-function(vpp_generate_api_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 ${file}.h"
-  )
-endfunction()
-
-function(vpp_add_api_files target)
-  unset(header_files)
-  foreach(file ${ARGN})
-    vpp_generate_api_header (${file})
-    list (APPEND header_files ${file}.h)
-  endforeach()
-  add_custom_target(${target} DEPENDS ${header_files})
-endfunction()
-
-add_custom_target(api_headers
-  DEPENDS vlibmemory_api_headers vnet_api_headers vpp_api_headers
-)
-
-##############################################################################
-# header files
-##############################################################################
-function (vpp_add_header_files path)
-  foreach(file ${ARGN})
-    get_filename_component(dir ${file} DIRECTORY)
-    install(FILES ${file} DESTINATION include/${path}/${dir})
-  endforeach()
-endfunction()
+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
 ##############################################################################
-foreach (DIR vppinfra svm vlib vlibmemory vnet vpp vpp-api vcl plugins)
+foreach (DIR vppinfra svm vlib vlibmemory vlibapi vnet vpp vat vcl plugins vpp-api)
   add_subdirectory(${DIR})
 endforeach ()
 
-##############################################################################
-# DEB Packaging
-##############################################################################
-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)