X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=248d7b8d39edfd476368072172b879bf8821bca1;hb=9654a37fac7fe2b425576eb0237b8d24ae44e1b1;hp=05457ebe40ce896429b7b4fe01efb481a138d264;hpb=0fa900e482451d05449501c1422bfa7c47eec661;p=vpp.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 05457ebe40c..248d7b8d39e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 project(vpp C)
 
 include(CheckCCompilerFlag)
-include(cmake/message.cmake)
+include(cmake/misc.cmake)
 include(cmake/cpu.cmake)
 include(cmake/ccache.cmake)
 
@@ -32,20 +32,42 @@ execute_process(
 string(REPLACE "-" ";" VPP_LIB_VERSION ${VPP_VERSION})
 list(GET VPP_LIB_VERSION 0 VPP_LIB_VERSION)
 
+##############################################################################
+# cross compiling
+##############################################################################
+if(CMAKE_CROSSCOMPILING)
+  set(CMAKE_IGNORE_PATH
+    /usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/
+    /usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/lib/
+  )
+endif()
+set(CMAKE_C_COMPILER_TARGET ${CMAKE_SYSTEM_PROCESSOR}-linux-gnu)
+
 ##############################################################################
 # build config
 ##############################################################################
+check_c_compiler_flag("-Wno-address-of-packed-member"
+		      compiler_flag_no_address_of_packed_member)
+
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-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 (CMAKE_BUILD_TYPE)
+  set(CMAKE_C_FLAGS "-g -fPIC ${CMAKE_C_FLAGS}")
+  set(CMAKE_C_FLAGS "-fstack-protector-all ${CMAKE_C_FLAGS}")
+  set(CMAKE_C_FLAGS "-Werror ${CMAKE_C_FLAGS}")
+  set(CMAKE_C_FLAGS "-DFORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
+endif()
+
 if (compiler_flag_no_address_of_packed_member)
-  add_definitions(-Wno-address-of-packed-member)
+  set(CMAKE_C_FLAGS "-Wno-address-of-packed-member ${CMAKE_C_FLAGS}")
 endif()
 
+set(CMAKE_C_FLAGS_RELEASE "-O2 ${CMAKE_C_FLAGS_RELEASE}")
+set(CMAKE_C_FLAGS_DEBUG "-O0 -DCLIB_DEBUG ${CMAKE_C_FLAGS_DEBUG}")
+set(CMAKE_LINKER_FLAGS_RELEASE "-pie -Wl,-z,now ${CMAKE_LINKER_FLAGS_RELEASE}")
+string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_UC)
+
 ##############################################################################
 # install config
 ##############################################################################
@@ -62,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)
@@ -75,7 +97,8 @@ 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
+    vpp-api tools/vppapigen tools/g2 tools/elftool tools/perftool cmake pkg
+    tools/appimage
   )
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
   set(SUBDIRS vppinfra)
@@ -87,7 +110,6 @@ foreach(DIR ${SUBDIRS})
   add_subdirectory(${DIR})
 endforeach()
 
-include(cmake/pack.cmake)
 ##############################################################################
 # detect if we are inside git repo and add configure dependency
 ##############################################################################
@@ -96,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)
@@ -112,9 +135,10 @@ 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("C flags" "${CMAKE_C_FLAGS}${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UC}}")
+pr("Linker flags" "${CMAKE_LINKER_FLAGS}${CMAKE_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}}")
+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}")
-