diff options
| author |   Alberto Compagno <acompagn+fdio@cisco.com> | 2019-07-24 14:41:11 +0200 |
|---|---|---|
| committer | Alberto Compagno <acompagn+fdio@cisco.com> | 2019-07-24 14:53:41 +0200 |
| commit | 7ceadff88f62665194deb12ca0926f5dcd6d3f48 (patch) | |
| tree | 417cb6297f49241f6506b444e75e54301712cbd2 | |
| parent | 932b7a20f099823e84139b0ee5693f3612e42a2d (diff) | |
[HICN-251] Renaming hicn_extra_plugin.so in hicn_router.so and adjusting installation path to cope with x86_64-linux-gnu
Change-Id: I5314b871bd4143f7249f3a3f639e17a25b22380b
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
| -rw-r--r-- | utils/extras/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/utils/extras/CMakeLists.txt b/utils/extras/CMakeLists.txt index 85f924cb1..d92ac4a68 100644 --- a/utils/extras/CMakeLists.txt +++ b/utils/extras/CMakeLists.txt @@ -14,6 +14,8 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(extra-plugin) +include(GNUInstallDirs) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Modules/" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/" @@ -65,7 +67,7 @@ if (NOT CMAKE_BUILD_TYPE) set (CMAKE_BUILD_TYPE "Release") endif (NOT CMAKE_BUILD_TYPE) -SET(EXTRA_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/lib CACHE STRING "extra_install_prefix") +SET(EXTRA_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "extra_install_prefix") if (CMAKE_BUILD_TYPE STREQUAL "Release") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -march=native -O3 -g") @@ -89,7 +91,8 @@ set_target_properties(hicn_extra_plugin PROPERTIES LINKER_LANGUAGE C INSTALL_RPATH ${VPP_INSTALL_PLUGIN} - PREFIX "") + PREFIX "" + LIBRARY_OUTPUT_NAME "hicn_router") install(DIRECTORY DESTINATION ${VPP_INSTALL_PLUGIN} |