diff options
| author | Kevron Rees <kevron.m.rees@intel.com> | 2015-10-29 12:59:45 -0700 |
|---|---|---|
| committer | Brendan Le Foll <brendan.le.foll@intel.com> | 2015-10-30 12:04:58 +0000 |
| commit | 937a38c4acfc26ecb86524fb7d5d856595923720 (patch) | |
| tree | 729479c58a9d94a69e8dea1d01f47e16c8685c40 | |
| parent | cd4626852d55e5f6067f01a0e1c11b86fdd8e4f4 (diff) | |
cmake: use cmake libdir instead of making our own
Signed-off-by: Kevron Rees <kevron.m.rees@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e26c99..eaec7a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ FIND_PACKAGE (Threads REQUIRED) set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fno-omit-frame-pointer ") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall ") -set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries") +set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries") # Set CMAKE_LIB_INSTALL_DIR if not defined include(GNUInstallDirs) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5e1f413..2f4cd73 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -100,7 +100,7 @@ macro (mraa_CREATE_INSTALL_PKGCONFIG generated_file install_location) configure_file (${generated_file}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${generated_file} @ONLY) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${generated_file} DESTINATION ${install_location}) endmacro (mraa_CREATE_INSTALL_PKGCONFIG) -mraa_create_install_pkgconfig (mraa.pc lib${LIB_SUFFIX}/pkgconfig) +mraa_create_install_pkgconfig (mraa.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(TARGETS mraa DESTINATION ${CMAKE_INSTALL_LIBDIR}) |