diff options
| author |   Damjan Marion <damarion@cisco.com> | 2021-09-30 20:04:14 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2021-10-05 16:44:32 +0000 |
| commit | 5546e43f7943d6edff6c6587ed4e7233e8002e28 (patch) | |
| tree | 16b4a8ce7a63c4cf1ce7f367b0d0f1d9268f2849 /src/CMakeLists.txt | |
| parent | efd967faff168d037066b6e6824d2a579adbef93 (diff) | |
build: don't hardcode triplet, allow specifying custom lib dir
Type: fix
Change-Id: I33f364fda88914f88f9b976cb83e6d3ff466f0bb
Signed-off-by: Damjan Marion <damarion@cisco.com>
Signed-off-by: Ray Kinsella <mdr@ashroe.eu>
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7bb5caad734..0448a5b640e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,6 +33,10 @@ if(CMAKE_VERSION VERSION_LESS 3.12) endmacro() endif() +if(NOT DEFINED CMAKE_INSTALL_LIBDIR AND EXISTS "/etc/debian_version") + set(CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}") +endif() + include(CheckCCompilerFlag) include(CheckIPOSupported) include(GNUInstallDirs) @@ -152,7 +156,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}/${CMAKE_INSTALL_LIBDIR}") + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${VPP_LIBRARY_DIR}") endif() set(CMAKE_INSTALL_MESSAGE NEVER) |