Branch 'libkolabxml-1.0' - CMakeLists.txt
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Tue Aug 26 12:46:51 CEST 2014
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 55417f124ca7ba76b77d6366a41bd310c1f3177d
Author: Daniel Vrátil <dvratil at redhat.com>
Date: Tue Aug 26 12:42:40 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 4a06d37..9aad8fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ endif()
#C++ is required from here on
enable_language(CXX)
-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}/kolabxml)
set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/Libkolabxml )
More information about the commits
mailing list