From: Nick Brown <nickbroon@gmail.com>
Date: Wed, 29 Sep 2021 15:13:23 +0000 (+0100)
Subject: build: consistent use of CMAKE_INSTALL_LIBDIR
X-Git-Tag: v22.06-rc0~478
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F33889%2F2;p=vpp.git

build: consistent use of CMAKE_INSTALL_LIBDIR

Set the RPATH to based on CMAKE_INSTALL_LIBDIR so that libraries are
correctly found.

Type: make
Change-Id: I82d649345edea2c5d3f6b3f43e3e5869b9e580a7
Signed-off-by: Nick Brown <nickbroon@gmail.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 415a9c9c4e9..7bb5caad734 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -152,7 +152,7 @@ endif()
 ##############################################################################
 option(VPP_SET_RPATH "Set rpath for resulting binaries and libraries." ON)
 if(VPP_SET_RPATH)
-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 endif()
 set(CMAKE_INSTALL_MESSAGE NEVER)