summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2012-03-28 10:09:10 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2012-03-28 10:09:10 (GMT)
commit860c24a832874b815dd8b0d9309204768768fa00 (patch)
treeb9acaced2b1bcc50eece9ec3578714dacc477ce4
parent1aa83f868ecb43d035a45b5225585ca3b82d301b (diff)
parentd85f7b06ea265f7814bea6160ce25a814616e2b4 (diff)
downloadlibkolabxml-860c24a832874b815dd8b0d9309204768768fa00.tar.gz
Merge branch 'master' of ssh://git.kolab.org/git/libkolabxml
-rw-r--r--cmake/modules/FindKolabInternal.cmake24
1 files changed, 14 insertions, 10 deletions
diff --git a/cmake/modules/FindKolabInternal.cmake b/cmake/modules/FindKolabInternal.cmake
index fb9d6a5..19ba440 100644
--- a/cmake/modules/FindKolabInternal.cmake
+++ b/cmake/modules/FindKolabInternal.cmake
@@ -10,19 +10,23 @@
#
# KOLAB_INSTALL_DIRECTORIES contains the determined install directories and should be used with install commands
-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-
-if (${LIB64} STREQUAL "TRUE")
- find_path(LIB32FOUND "${CMAKE_INSTALL_PREFIX}/lib32")
- find_path(LIB64FOUND "${CMAKE_INSTALL_PREFIX}/lib64")
- if (LIB64FOUND)
- set(LIBSUFFIX 64)
+if (LIB_INSTALL_DIR)
+ set(KOLAB_LIB_INSTALL_DIR ${LIB_INSTALL_DIR})
+else ()
+ get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+
+ if (${LIB64} STREQUAL "TRUE")
+ find_path(LIB32FOUND "${CMAKE_INSTALL_PREFIX}/lib32")
+ find_path(LIB64FOUND "${CMAKE_INSTALL_PREFIX}/lib64")
+ if (LIB64FOUND)
+ set(LIBSUFFIX 64)
+ else()
+ set(LIBSUFFIX "")
+ endif()
else()
set(LIBSUFFIX "")
endif()
-else()
- set(LIBSUFFIX "")
-endif()
+endif ()
if(KOLAB_LIB_INSTALL_DIR)
message("KOLAB_LIB_INSTALL_DIR specified manually")