Branch 'c++/master' - c++/tests
Christian Mollekopf
mollekopf at kolabsys.com
Fri Dec 30 16:00:29 CET 2011
c++/tests/CMakeLists.txt | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 866586944a3abfd5af4e3b5f48386fc58bd8722e
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Fri Dec 30 15:56:39 2011 +0100
link against QtCore
diff --git a/c++/tests/CMakeLists.txt b/c++/tests/CMakeLists.txt
index 724087a..c3413f7 100644
--- a/c++/tests/CMakeLists.txt
+++ b/c++/tests/CMakeLists.txt
@@ -3,15 +3,15 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${QT_INCLUDES} ${QT_INCLUDE_DIR} QtCore)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
-if (KDECORE_FOUND AND KCALCORE_FOUND)
+if (QT4_FOUND AND KDECORE_FOUND AND KCALCORE_FOUND)
message("Buildings tests")
QT4_AUTOMOC(bindingstest.cpp)
add_executable(bindingstest bindingstest.cpp ${CMAKE_CURRENT_BINARY_DIR}/${BINDINGSTEST_MOC})
- target_link_libraries(bindingstest ${QT_QTTEST_LIBRARY} kolabxml kolabkcal ${XERCES_C})
+ target_link_libraries(bindingstest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} kolabxml kolabkcal ${XERCES_C})
QT4_AUTOMOC(kcalconversiontest.cpp)
add_executable(kcalconversiontest kcalconversiontest.cpp ${CMAKE_CURRENT_BINARY_DIR}/${KCALCONVERSIONTEST_MOC})
- target_link_libraries(kcalconversiontest ${QT_QTTEST_LIBRARY} kolabxmlkcal ${XERCES_C})
+ target_link_libraries(kcalconversiontest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} kolabxmlkcal ${XERCES_C})
else()
- message(WARNING "Could not build tests because kdepimlibs is missing")
-endif()
\ No newline at end of file
+ message(WARNING "Could not build tests because kdepimlibs, kdelibs or qt is missing")
+endif()
More information about the commits
mailing list