diff options
author | Damjan Marion <damarion@cisco.com> | 2020-05-07 16:49:45 +0200 |
---|---|---|
committer | Florin Coras <florin.coras@gmail.com> | 2020-05-08 17:01:32 +0000 |
commit | 599efc67e87e89666d44efd34b5d3db7ccf1f4ca (patch) | |
tree | 5ced205cb5ff5247e8e9b596295d4ab4d60319c5 /src/CMakeLists.txt | |
parent | 13f64ce2272539d97b8c499e8e298a053fb3c9e2 (diff) |
build: various improvements
- add option to install only host tools
- add option to specify lib and runtime dir
Type: improvement
Change-Id: I6356b52df459120fc9b0127948bae7679fb10e52
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2e3cf6b1d68..59c7512a044 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,9 +50,11 @@ set(CMAKE_C_COMPILER_TARGET ${CMAKE_SYSTEM_PROCESSOR}-linux-gnu) ############################################################################## check_c_compiler_flag("-Wno-address-of-packed-member" compiler_flag_no_address_of_packed_member) +set(VPP_RUNTIME_DIR "bin" CACHE STRING "Relative runtime directory path") +set(VPP_LIBRARY_DIR "lib" CACHE STRING "Relative library directory path") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${VPP_RUNTIME_DIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${VPP_LIBRARY_DIR}) if (CMAKE_BUILD_TYPE) set(CMAKE_C_FLAGS "-g -fPIC -Werror -Wall ${CMAKE_C_FLAGS}") @@ -107,12 +109,12 @@ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY # sanitizers ############################################################################## -option(ENABLE_SANITIZE_ADDR "Enable Address Sanitizer" OFF) -if (ENABLE_SANITIZE_ADDR) +option(VPP_ENABLE_SANITIZE_ADDR "Enable Address Sanitizer" OFF) +if (VPP_ENABLE_SANITIZE_ADDR) set(CMAKE_C_FLAGS "-fsanitize=address --param asan-stack=0 -DCLIB_SANITIZE_ADDR ${CMAKE_C_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "-fsanitize=address ${CMAKE_EXE_LINKER_FLAGS}") set(CMAKE_SHARED_LINKER_FLAGS "-fsanitize=address ${CMAKE_SHARED_LINKER_FLAGS}") -endif (ENABLE_SANITIZE_ADDR) +endif (VPP_ENABLE_SANITIZE_ADDR) ############################################################################## # install config @@ -139,7 +141,10 @@ include(cmake/plugin.cmake) ############################################################################## # subdirs - order matters ############################################################################## -if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") +option(VPP_HOST_TOOLS_ONLY "Build only host tools" OFF) +if(VPP_HOST_TOOLS_ONLY) + set(SUBDIRS tools/vppapigen cmake) +elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") find_package(OpenSSL REQUIRED) set(SUBDIRS vppinfra svm vlib vlibmemory vlibapi vnet vpp vat vcl plugins |