From 79dcbc74cd417f4caf41bc398ccba94cab7d656b Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 12 Sep 2018 14:01:10 +0200 Subject: Always use 'lib' instead of 'lib64' It is packaging responsibility to put libs in the right place. Use of lib64 resulted in huge amount of files with hardcoded lib64. This patch simplifies things... Change-Id: Iab0dea0583e480907732c5d2379eb951a00fa9e6 Signed-off-by: Damjan Marion --- extras/vom/CMakeLists.txt | 10 +--------- extras/vom/vom/CMakeLists.txt | 14 +++++++------- 2 files changed, 8 insertions(+), 16 deletions(-) (limited to 'extras/vom') diff --git a/extras/vom/CMakeLists.txt b/extras/vom/CMakeLists.txt index d3557104fd8..e84e2a91850 100644 --- a/extras/vom/CMakeLists.txt +++ b/extras/vom/CMakeLists.txt @@ -18,16 +18,8 @@ project(vom) include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) -if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") - set(VOM_LIB_DIR_NAME lib64) -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)") - set(VOM_LIB_DIR_NAME lib64) -else() - set(VOM_LIB_DIR_NAME lib) -endif() - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${VOM_LIB_DIR_NAME}) +set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) set(CMAKE_INSTALL_MESSAGE NEVER) find_package(Threads REQUIRED) diff --git a/extras/vom/vom/CMakeLists.txt b/extras/vom/vom/CMakeLists.txt index c9ff7aa41ee..76abd4604c5 100644 --- a/extras/vom/vom/CMakeLists.txt +++ b/extras/vom/vom/CMakeLists.txt @@ -19,8 +19,8 @@ unset (GBP_FILE) unset (VOM_SOURCES) unset (VOM_HEADERS) -find_library(VAPICLIENT_LIB NAMES vapiclient REQUIRED HINTS ${VPP_LIB_DIR_HINT}) -find_path(VAPICLIENT_INCLUDE_DIR NAMES vapi/vapi.hpp HINTS ${VPP_INCLUDE_DIR_HINT}) +find_library(VAPICLIENT_LIB NAMES vapiclient REQUIRED) +find_path(VAPICLIENT_INCLUDE_DIR NAMES vapi/vapi.hpp) if(NOT VAPICLIENT_INCLUDE_DIR OR NOT VAPICLIENT_LIB) message(FATAL_ERROR "Cannot find vapiclient library and/or headers") @@ -29,10 +29,10 @@ endif() include_directories(${VAPICLIENT_INCLUDE_DIR}) include_directories(${CMAKE_SOURCE_DIR}) -find_file(ACL_FILE NAMES acl.api.vapi.hpp PATH_SUFFIXES vapi HINTS ${VPP_INCLUDE_DIR_HINT}) -find_file(NAT_FILE NAMES nat.api.vapi.hpp PATH_SUFFIXES vapi HINTS ${VPP_INCLUDE_DIR_HINT}) -find_file(L2E_FILE NAMES l2e.api.vapi.hpp PATH_SUFFIXES vapi HINTS ${VPP_INCLUDE_DIR_HINT}) -find_file(GBP_FILE NAMES gbp.api.vapi.hpp PATH_SUFFIXES vapi HINTS ${VPP_INCLUDE_DIR_HINT}) +find_file(ACL_FILE NAMES acl.api.vapi.hpp PATH_SUFFIXES vapi) +find_file(NAT_FILE NAMES nat.api.vapi.hpp PATH_SUFFIXES vapi) +find_file(L2E_FILE NAMES l2e.api.vapi.hpp PATH_SUFFIXES vapi) +find_file(GBP_FILE NAMES gbp.api.vapi.hpp PATH_SUFFIXES vapi) if(ACL_FILE) list(APPEND VOM_SOURCES @@ -232,7 +232,7 @@ add_library(vom SHARED ${VOM_SOURCES}) target_link_libraries(vom ${VAPICLIENT_LIB} Threads::Threads boost_thread ${BOOST_SYSTEM_LIB} ${BOOST_FILESYSTEM_LIB} ${BOOST_ASIO_LIB} m rt) add_definitions(-Wall -Werror -std=gnu++11) -install(TARGETS vom DESTINATION ${VOM_LIB_DIR_NAME}) +install(TARGETS vom DESTINATION lib) foreach(file ${VOM_HEADERS}) install(FILES ${file} DESTINATION include/vom) -- cgit 1.2.3-korg