From fba6aef9c4cddcc9728192bd17d0c1906a9b2dcd Mon Sep 17 00:00:00 2001 From: Francois Keith Date: Fri, 13 Sep 2013 18:56:06 +0200 Subject: [PATCH] Cancel the force default libdir value. On 64bits systems, this forces the installation path to be lib/ rather than x86_64-linux-gnu/lib Also, when passing in the if condition, the lib install path becomes in the .pc file ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_PREFIX}/lib which will cause some issues later when using those informations. --- base.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base.cmake b/base.cmake index 763472a79..d960f8b27 100644 --- a/base.cmake +++ b/base.cmake @@ -113,10 +113,10 @@ ENDMACRO(_CONCATENATE_ARGUMENTS OUTPUT) # file). # MACRO(SETUP_PROJECT) + INCLUDE(cmake/GNUInstallDirs.cmake) IF(NOT DEFINED CMAKE_INSTALL_LIBDIR) - SET(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib) + SET(CMAKE_INSTALL_LIBDIR lib) ENDIF() - INCLUDE(cmake/GNUInstallDirs.cmake) SET(CMAKE_INSTALL_FULL_PKGLIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}) SET(CMAKE_INSTALL_PKGLIBDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})