c++/CMakeLists.txt c++/lib

[Christian Mollekopf]

 c++/CMakeLists.txt            |   17 ++++++++++++++---
 c++/lib/CMakeLists.txt        |    2 +-
 c++/lib/php/CMakeLists.txt    |    2 +-
 c++/lib/python/CMakeLists.txt |    2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit e0d94343dd77de9f538cea03ebd35c3f8127f61d
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Feb 24 17:58:05 2012 +0100

    Improve buildsystem, require only cmake 2.6

diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
index 83ceb27..a2ac011 100644
--- a/c++/CMakeLists.txt
+++ b/c++/CMakeLists.txt
@@ -1,9 +1,20 @@
 project(kolabxmlbindings)
 
-cmake_minimum_required(VERSION 2.8)
-cmake_policy(SET CMP0017 NEW)
+cmake_minimum_required(VERSION 2.6)
+
+# only available from cmake-2.8.0
+if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7)
+    cmake_policy(SET CMP0012 NEW)
+endif()
+
+# only available from cmake-2.8.4
+if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND
+    ${CMAKE_PATCH_VERSION} GREATER 3)
+    cmake_policy(SET CMP0017 NEW)
+endif()
+
+find_package(Boost COMPONENTS thread REQUIRED)
 
-find_package(Boost REQUIRED)
 find_package(Qt4)
 find_program( XSDCXX xsdcxx /usr/bin/)
 if(XSDCXX)
diff --git a/c++/lib/CMakeLists.txt b/c++/lib/CMakeLists.txt
index dfd4921..12c2133 100644
--- a/c++/lib/CMakeLists.txt
+++ b/c++/lib/CMakeLists.txt
@@ -10,7 +10,7 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC " ) #always generate shared libra
 
 #Library with serialization/deserialization code and kolab-containers
 add_library(kolabxml SHARED kolabformat.cpp kolabcontainers.cpp kolabevent.cpp kolabtodo.cpp kolabjournal.cpp kolabcontact.cpp utils.cpp base64.cpp ../compiled/XMLParserWrapper.cpp ../compiled/grammar-input-stream.cxx ${SCHEMA_SOURCEFILES})
-target_link_libraries(kolabxml ${XERCES_C} boost_thread)
+target_link_libraries(kolabxml ${XERCES_C} ${Boost_LIBRARIES})
 
 #For the core library we can be stricter when compiling. This doesn't work with the auto generated code though.
 set_target_properties(kolabxml PROPERTIES COMPILE_FLAGS "-Wl,--no-undefined -Werror ")
diff --git a/c++/lib/php/CMakeLists.txt b/c++/lib/php/CMakeLists.txt
index f578646..70f4427 100644
--- a/c++/lib/php/CMakeLists.txt
+++ b/c++/lib/php/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_libraries(phpbindings kolabxml ${PHP_LIBRARIES})
 SET_TARGET_PROPERTIES(phpbindings PROPERTIES OUTPUT_NAME "kolabformat")
 SET_TARGET_PROPERTIES(phpbindings PROPERTIES PREFIX "")
 
-file(COPY test.php DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+configure_file(test.php ${CMAKE_CURRENT_BINARY_DIR}/DESTINATION COPYONLY)
 
 install(TARGETS phpbindings LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/phpbindings)
 
diff --git a/c++/lib/python/CMakeLists.txt b/c++/lib/python/CMakeLists.txt
index a0a99c6..95790e2 100644
--- a/c++/lib/python/CMakeLists.txt
+++ b/c++/lib/python/CMakeLists.txt
@@ -24,7 +24,7 @@ target_link_libraries(pythonbindings kolabxml ${PYTHON_LIBRARY})
 SET_TARGET_PROPERTIES(pythonbindings PROPERTIES OUTPUT_NAME "_kolabformat")
 SET_TARGET_PROPERTIES(pythonbindings PROPERTIES PREFIX "")
 
-file(COPY test.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+configure_file(test.py ${CMAKE_CURRENT_BINARY_DIR}/DESTINATION COPYONLY)
 
 install(TARGETS pythonbindings LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/pythonbindings)