Browse Source

cmake: use cmake libdir

Signed-off-by: Kevron Rees <kevron.m.rees@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Kevron Rees 9 years ago
parent
commit
6e2355ce9a
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      CMakeLists.txt
  2. 1
    1
      src/CMakeLists.txt

+ 1
- 1
CMakeLists.txt View File

@@ -15,7 +15,7 @@ message (INFO " found mraa version: ${MRAA_VERSION}")
15 15
 
16 16
 # Appends the cmake/modules path to MAKE_MODULE_PATH variable.
17 17
 set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
18
-set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries")
18
+set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries")
19 19
 
20 20
 # Set CMAKE_LIB_INSTALL_DIR if not defined
21 21
 include(GNUInstallDirs)

+ 1
- 1
src/CMakeLists.txt View File

@@ -184,7 +184,7 @@ macro(upm_module_init)
184 184
     SOVERSION ${upm_VERSION_MAJOR}
185 185
     VERSION ${upm_VERSION_STRING}
186 186
   )
187
-  upm_create_install_pkgconfig (upm-${libname}.pc lib${LIB_SUFFIX}/pkgconfig)
187
+  upm_create_install_pkgconfig (upm-${libname}.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
188 188
   if (SWIG_FOUND)
189 189
     upm_swig_python()
190 190
     upm_swig_node()