Adapt CMakeLists.txt as discussed with Alex.

KDE4_ADD_TEST_EXECUTABLE is deprecated now use KDE4_ADD_EXECUTABLE(<target> TEST <files>) instead
QT4_ADD_DBUS_INTERFACE_NO_NAMESPACE and QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE are deprecated too
used SET_SOURCE_FILES_PROPERTIES(<files> PROPERTIES NO_NAMESPACE TRUE) QT4_ADD_DBUS_INTERFACES(<srcList> <files>)
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) is put in each CMakeLists.txt where
KDE4_ADD_EXECUTABLE(<target> TEST <files>) and KDE4_ADD_UNIT_TEST were used.

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=716151

diff --git a/extdate/tests/CMakeLists.txt b/extdate/tests/CMakeLists.txt
index 6a75e9d8980b51975f03dbd5118d7f129af1e5ab..714dbee10417df4faa51e486ed6c0a7c358a637b 100644 (file)
--- a/extdate/tests/CMakeLists.txt
+++ b/extdate/tests/CMakeLists.txt
@@ -1,3 +1,4 @@
+set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/extdate  )
 
 
@@ -6,7 +7,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/extdate  )
 set(test_extdate_SRCS test_extdate.cc )
 
 
-kde4_add_test_executable(test_extdate ${test_extdate_SRCS})
+kde4_add_executable(test_extdate TEST ${test_extdate_SRCS})
 
 target_link_libraries(test_extdate  ${KDE4_KDECORE_LIBS} extdate )
 
@@ -15,7 +16,7 @@ target_link_libraries(test_extdate  ${KDE4_KDECORE_LIBS} extdate )
 set(test_extdatepicker_SRCS edpicker_widget.cpp edpicker_main.cpp )
 
 
-kde4_add_test_executable(test_extdatepicker ${test_extdatepicker_SRCS})
+kde4_add_executable(test_extdatepicker TEST ${test_extdatepicker_SRCS})
 
 target_link_libraries(test_extdatepicker  ${KDE4_KDECORE_LIBS} extdate )
 
@@ -24,7 +25,7 @@ target_link_libraries(test_extdatepicker  ${KDE4_KDECORE_LIBS} extdate )
 set(test_extdatetimeedit_SRCS edtedit_widget.cpp edtedit_main.cpp )
 
 
-kde4_add_test_executable(test_extdatetimeedit ${test_extdatetimeedit_SRCS})
+kde4_add_executable(test_extdatetimeedit TEST ${test_extdatetimeedit_SRCS})
 
 target_link_libraries(test_extdatetimeedit  ${KDE4_KDECORE_LIBS} extdate )
 

diff --git a/keduvocdocument/tests/CMakeLists.txt b/keduvocdocument/tests/CMakeLists.txt
index d9b6252b81f467ff16dc63697d62b66cec2871b7..056ba33b0e335e21a31b3da2818e05526c9cd280 100644 (file)
--- a/keduvocdocument/tests/CMakeLists.txt
+++ b/keduvocdocument/tests/CMakeLists.txt
@@ -1,3 +1,4 @@
+set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 
 kde4_add_unit_test(keduvocdocumentvalidatortest keduvocdocumentvalidatortest.cpp)

diff --git a/libscience/tests/CMakeLists.txt b/libscience/tests/CMakeLists.txt
index b9dc0c632b5502986cd8c40473104813d2e9f06c..d9f312f32ef03b706590ac13e6c9cfab26349a39 100644 (file)
--- a/libscience/tests/CMakeLists.txt
+++ b/libscience/tests/CMakeLists.txt
@@ -1,10 +1,11 @@
+set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 ########### next target ###############
 
 set(elementparsertest_SRCS xmlreadingtest.cpp)
 
-kde4_add_test_executable(elementparsertest ${elementparsertest_SRCS})
+kde4_add_executable(elementparsertest TEST ${elementparsertest_SRCS})
 
 target_link_libraries(elementparsertest science)
 
@@ -12,7 +13,7 @@ target_link_libraries(elementparsertest science)
 
 set(isotopeparsertest_SRCS isotopereadingtest.cpp)
 
-kde4_add_test_executable(isotopeparsertest ${isotopeparsertest_SRCS})
+kde4_add_executable(isotopeparsertest TEST ${isotopeparsertest_SRCS})
 
 target_link_libraries(isotopeparsertest science)