aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/Modules
diff options
context:
space:
mode:
authorMasoud Hemmatpour <mhemmatp@cisco.com>2019-11-26 12:05:02 +0100
committerAlberto Compagno <acompagn+fdio@cisco.com>2019-11-29 15:58:20 +0000
commit7981b901c43848d3b923ec49515b28a75ab984e3 (patch)
treed5177ebe141bba140f97984999bf157126eefc5b /cmake/Modules
parentb3ee2ed8602c909f8d5096e9d8d44aa345093566 (diff)
[HICN-403] update vapi communication with vpp
Signed-off-by: Masoud Hemmatpour <mhemmatp@cisco.com> Change-Id: I6e05d96af049229a6dc2da0adf32707873cdc816 Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
Diffstat (limited to 'cmake/Modules')
-rw-r--r--cmake/Modules/BuildMacros.cmake11
-rw-r--r--cmake/Modules/FindSysrepo.cmake2
2 files changed, 9 insertions, 4 deletions
diff --git a/cmake/Modules/BuildMacros.cmake b/cmake/Modules/BuildMacros.cmake
index 85789a08a..ed767dbcc 100644
--- a/cmake/Modules/BuildMacros.cmake
+++ b/cmake/Modules/BuildMacros.cmake
@@ -73,7 +73,7 @@ macro(build_library lib)
cmake_parse_arguments(ARG
"SHARED;STATIC;NO_DEV"
"COMPONENT;"
- "SOURCES;LINK_LIBRARIES;INSTALL_HEADERS;DEPENDS;INCLUDE_DIRS;DEFINITIONS;INSTALL_ROOT_DIR"
+ "SOURCES;LINK_LIBRARIES;INSTALL_HEADERS;DEPENDS;INCLUDE_DIRS;DEFINITIONS;INSTALL_ROOT_DIR;INSTALL_FULL_PATH_DIR"
${ARGN}
)
@@ -145,11 +145,17 @@ macro(build_library lib)
)
endif()
+ set(INSTALL_LIB_PATH ${CMAKE_INSTALL_LIBDIR})
+
+ if (ARG_INSTALL_FULL_PATH_DIR)
+ set(INSTALL_LIB_PATH ${ARG_INSTALL_FULL_PATH_DIR})
+ endif()
+
install(
TARGETS ${library}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${INSTALL_LIB_PATH}
COMPONENT ${ARG_COMPONENT}
)
@@ -160,7 +166,6 @@ macro(build_library lib)
# install headers
if(ARG_INSTALL_HEADERS)
-
if (NOT ARG_INSTALL_ROOT_DIR)
set(ARG_INSTALL_ROOT_DIR "hicn")
endif()
diff --git a/cmake/Modules/FindSysrepo.cmake b/cmake/Modules/FindSysrepo.cmake
index 4228ef93a..1c389e480 100644
--- a/cmake/Modules/FindSysrepo.cmake
+++ b/cmake/Modules/FindSysrepo.cmake
@@ -43,4 +43,4 @@ set(SYSREPO_INCLUDE_DIRS ${SYSREPO_INCLUDE_DIR} ${SYSREPO_INCLUDE_MAIN_DIR})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Sysrepo DEFAULT_MSG SYSREPO_LIBRARIES SYSREPO_INCLUDE_DIRS)
-mark_as_advanced(SYSREPO_LIBRARY SYSREPO_INCLUDE_DIR SYSREPO_INCLUDE_MAIN_DIR) \ No newline at end of file
+mark_as_advanced(SYSREPO_LIBRARY SYSREPO_INCLUDE_DIR SYSREPO_INCLUDE_MAIN_DIR)