summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2012-04-13 12:09:43 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2012-04-13 12:09:43 (GMT)
commit0eb815b60aa5155ccf3c8baa94b67e3e209d16dc (patch)
tree1223b649e1ee87aecad0f0cc982632e81183f3c7
parent3c887c55d7e9e75295a4e8bc03a7eb379bc748de (diff)
downloadlibkolabxml-0eb815b60aa5155ccf3c8baa94b67e3e209d16dc.tar.gz
Specify search paths for libraries.
This is likely a bug as this shouldn't be necessary.
-rw-r--r--CMakeLists.txt4
-rw-r--r--cmake/modules/FindKolabInternal.cmake12
2 files changed, 14 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e36c65..aa73e95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,7 @@ if (Boost_FOUND)
endif (Boost_FOUND)
if (${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.42)
- find_library(UUID NAMES ossp-uuid)
+ find_library(UUID NAMES ossp-uuid HINTS ${FIND_LIBRARY_PATHS})
if(UUID)
message("uuid found")
else (UUID)
@@ -81,7 +81,7 @@ else (XSDCXX)
"xsd code generator NOT found!")
endif(XSDCXX)
-find_library(XERCES_C NAMES xerces-c xerces-c_2)
+find_library(XERCES_C NAMES xerces-c xerces-c_2 HINTS ${FIND_LIBRARY_PATHS})
if(XERCES_C)
message("xerces found")
else (XERCES_C)
diff --git a/cmake/modules/FindKolabInternal.cmake b/cmake/modules/FindKolabInternal.cmake
index b187875..6e0c4ca 100644
--- a/cmake/modules/FindKolabInternal.cmake
+++ b/cmake/modules/FindKolabInternal.cmake
@@ -28,6 +28,18 @@ else ()
endif()
endif ()
+#With cmake 2.6 on 64bit the libraries are not correctly detected, which is afaik a bug. Therefore we workaround the issue by providing some hints manually.
+if(FIND_LIBRARY_PATHS)
+ message("FIND_LIBRARY_PATHS specified manually")
+else()
+ set(FIND_LIBRARY_PATHS
+ /usr/lib
+ /usr/lib64
+ /lib
+ /lib64)
+endif()
+message("FIND_LIBRARY_PATHS: ${FIND_LIBRARY_PATHS}")
+
if(KOLAB_LIB_INSTALL_DIR)
message("KOLAB_LIB_INSTALL_DIR specified manually")
else()