cmake/modules

[Jeroen van Meeuwen]

 cmake/modules/FindKolabInternal.cmake |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

New commits:
commit b3fd7516cf3b59654c2d8a11e2da6ac5221304e3
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Mar 28 10:29:58 2012 +0100

    Clause the KOLAB_LIB_INSTALL_DIR to recognize -DLIB_INSTALL_DIR

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")