Branch 'libkolab-0.5' - CMakeLists.txt

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Tue Aug 26 12:45:51 CEST 2014


 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit efb53dcea0844164b32f55ce212702a18f8456f9
Author: Daniel Vrátil <dvratil at redhat.com>
Date:   Tue Aug 26 12:44:52 2014 +0200

    Resolve #2722:
    
    libkolabxml ignores LIB_SUFFIX CMake variable. It is usually defined to 64bit systems to "64" to force installing libraries to lib64.
    
    This means that self-compiled libkolab is always installed into ${CMAKE_INSTALL_PREFIX}/lib, even on 64bit system that uses ${CMAKE_INSTALL_PREFIX}/lib64.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8575079..1a9405c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libko
 set(Libkolab_VERSION_STRING ${CMAKE_PROJECT_NAME}-${Libkolab_VERSION})
 
 # set up install directories.
-set(LIB_INSTALL_DIR lib CACHE STRING "The directories where to install libraries to")
+set(LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE STRING "The directories where to install libraries to")
 set(INCLUDE_INSTALL_DIR include CACHE STRING "The directory where to install headers to")
 set(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/kolab)
 set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/Libkolab )




More information about the commits mailing list