build: consistent use of CMAKE_INSTALL_LIBDIR 89/33889/2
authorNick Brown <nickbroon@gmail.com>
Wed, 29 Sep 2021 15:13:23 +0000 (16:13 +0100)
committerDamjan Marion <dmarion@me.com>
Thu, 30 Sep 2021 10:12:47 +0000 (10:12 +0000)
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>
src/CMakeLists.txt

index 415a9c9..7bb5caa 100644 (file)
@@ -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)