d138b638e7
- drop BR: gcc-c++ - s/qt-devel/qt4-devel/ s/kdelibs-devel/kdelibs4-devel/ - fix build against boost-1.50
25 lines
1.4 KiB
Diff
25 lines
1.4 KiB
Diff
diff -up libkolabxml-0.7.0/CMakeLists.txt.boost libkolabxml-0.7.0/CMakeLists.txt
|
|
--- libkolabxml-0.7.0/CMakeLists.txt.boost 2012-07-19 05:23:24.000000000 -0500
|
|
+++ libkolabxml-0.7.0/CMakeLists.txt 2012-08-12 19:02:38.719584118 -0500
|
|
@@ -82,7 +82,7 @@ set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTAL
|
|
configure_file(libkolabxml-version.h.cmake "${CMAKE_BINARY_DIR}/libkolabxml-version.h" @ONLY)
|
|
|
|
set(Boost_USE_MULTITHREADED ON)
|
|
-find_package(Boost REQUIRED COMPONENTS thread)
|
|
+find_package(Boost REQUIRED COMPONENTS thread system)
|
|
if (Boost_FOUND)
|
|
message("Found boost in ${Boost_INCLUDE_DIRS}")
|
|
endif (Boost_FOUND)
|
|
diff -up libkolabxml-0.7.0/tests/CMakeLists.txt.boost libkolabxml-0.7.0/tests/CMakeLists.txt
|
|
--- libkolabxml-0.7.0/tests/CMakeLists.txt.boost 2012-07-19 05:23:24.000000000 -0500
|
|
+++ libkolabxml-0.7.0/tests/CMakeLists.txt 2012-08-12 19:03:06.654234896 -0500
|
|
@@ -13,7 +13,7 @@ if (QT4_FOUND)
|
|
|
|
QT4_AUTOMOC(conversiontest.cpp)
|
|
add_executable(conversiontest conversiontest.cpp ${CMAKE_CURRENT_BINARY_DIR}/${CONVERSIONTEST_MOC})
|
|
- target_link_libraries(conversiontest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} kolabxml ${XERCES_C})
|
|
+ target_link_libraries(conversiontest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} kolabxml ${XERCES_C} ${Boost_LIBRARIES})
|
|
|
|
QT4_AUTOMOC(parsingtest.cpp)
|
|
add_executable(parsingtest parsingtest.cpp ${CMAKE_CURRENT_BINARY_DIR}/${CONVERSIONTEST_MOC})
|