Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

pkg_config: Update mraa.pc.cmake to use new install dir

Browse Source 
LIB_SUFFIX is no longer used.  Replaced with LIB_INSTALL_DIR
which provides the correct lib dir with arch suffix.

Moved the call to include(GNUInstallDirs) prior to checking the
CMAKE_INSTALL_LIBDIR - which is set by include(GNUInstallDirs).

Tested with cmake 2.8 and cmake 3.5.

Signed-off-by: Noel Eck <noel.eck@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Noel Eck
2016-03-29 12:41:13 -07:00
committed by Brendan Le Foll
parent 62e113ed3f
commit 69d9c26e6e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -5,14 +5,16 @@ FIND_PACKAGE (Threads REQUIRED)
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fno-omit-frame-pointer ") 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 (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall ")
# Set CMAKE_INSTALL_LIBDIR if not defined
include(GNUInstallDirs)
# Older cmake might not pick CMAKE_INSTALL_LIBDIR right # Older cmake might not pick CMAKE_INSTALL_LIBDIR right
if (CMAKE_INSTALL_LIBDIR) if (CMAKE_INSTALL_LIBDIR)
set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries") set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries")
else () else ()
set (LIB_INSTALL_DIR "lib" CACHE PATH "Installation path for libraries") set (LIB_INSTALL_DIR "lib" CACHE PATH "Installation path for libraries")
endif () endif ()
# Set CMAKE_LIB_INSTALL_DIR if not defined
include(GNUInstallDirs)
# By default, build shared object libraries on linux # By default, build shared object libraries on linux
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)

2
src/mraa.pc.cmake
View File

@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@ prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix} exec_prefix=${prefix}
libdir=${exec_prefix}/lib@LIB_SUFFIX@ libdir=${exec_prefix}/@LIB_INSTALL_DIR@
includedir=${prefix}/include includedir=${prefix}/include
Name: mraa Name: mraa