summaryrefslogtreecommitdiff
path: root/libkolabxml/CMakeLists.txt
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-03-28 00:41:52 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-03-28 00:41:52 (GMT)
commit85f98b950f43ab5df03fb9d6655f4c9d736ac756 (patch)
treedcb4e75958fbaae8a5bf30d158d63c7a2df02246 /libkolabxml/CMakeLists.txt
parente85f5827b2e16b4e020f0faa533df190ebd555c4 (diff)
downloadlibkolabxml-85f98b950f43ab5df03fb9d6655f4c9d736ac756.tar.gz
do not skip rpath, include boost-directories, find uuid library with different name
Diffstat (limited to 'libkolabxml/CMakeLists.txt')
-rw-r--r--libkolabxml/CMakeLists.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/libkolabxml/CMakeLists.txt b/libkolabxml/CMakeLists.txt
index ae8b503..946c93a 100644
--- a/libkolabxml/CMakeLists.txt
+++ b/libkolabxml/CMakeLists.txt
@@ -13,14 +13,17 @@ if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND
cmake_policy(SET CMP0017 NEW)
endif()
-# Do not use RPATH
-set(CMAKE_SKIP_RPATH ON)
include( ../cmake/modules/FindKolabInternal.cmake )
-find_package(Boost COMPONENTS thread REQUIRED)
+set(Boost_USE_MULTITHREADED ON)
+find_package(Boost REQUIRED COMPONENTS thread)
+if (Boost_FOUND)
+ message("Found boost in ${Boost_INCLUDE_DIRS}")
+ include_directories(${Boost_INCLUDE_DIRS})
+endif (Boost_FOUND)
if (${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.42)
- find_library(UUID NAMES uuid)
+ find_library(UUID NAMES ossp-uuid uuid)
if(UUID)
message("uuid found")
else (UUID)