Port to new kde4_add_*test* macros

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

diff --git a/extdate/tests/CMakeLists.txt b/extdate/tests/CMakeLists.txt
index 1aba207d7ec9364b596d02776948b2bbdcc94f3c..37efad933a24627e692c0cd221c85bb5fcfe3b76 100644 (file)
--- a/extdate/tests/CMakeLists.txt
+++ b/extdate/tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-if(KDE4_BUILD_TESTS)
 include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/extdate  )
 
 
@@ -8,7 +7,7 @@ set(test_extdate_SRCS test_extdate.cc )
 
 kde4_automoc(${test_extdate_SRCS})
 
-kde4_add_executable(test_extdate ${test_extdate_SRCS})
+kde4_add_test_executable(test_extdate ${test_extdate_SRCS})
 
 target_link_libraries(test_extdate  ${KDE4_KDECORE_LIBS} extdate )
 
@@ -18,7 +17,7 @@ set(test_extdatepicker_SRCS edpicker_widget.cpp edpicker_main.cpp )
 
 kde4_automoc(${test_extdatepicker_SRCS})
 
-kde4_add_executable(test_extdatepicker ${test_extdatepicker_SRCS})
+kde4_add_test_executable(test_extdatepicker ${test_extdatepicker_SRCS})
 
 target_link_libraries(test_extdatepicker  ${KDE4_KDECORE_LIBS} extdate )
 
@@ -28,9 +27,8 @@ set(test_extdatetimeedit_SRCS edtedit_widget.cpp edtedit_main.cpp )
 
 kde4_automoc(${test_extdatetimeedit_SRCS})
 
-kde4_add_executable(test_extdatetimeedit ${test_extdatetimeedit_SRCS})
+kde4_add_test_executable(test_extdatetimeedit ${test_extdatetimeedit_SRCS})
 
 target_link_libraries(test_extdatetimeedit  ${KDE4_KDECORE_LIBS} extdate )
 
-endif(KDE4_BUILD_TESTS)
 

diff --git a/kdeeducore/tests/CMakeLists.txt b/kdeeducore/tests/CMakeLists.txt
index 9d7774eef6bc2d82f0b679e3d42c775cacbf1bad..a139c255bcc64760fd8df0b28f5b9991535fbfef 100644 (file)
--- a/kdeeducore/tests/CMakeLists.txt
+++ b/kdeeducore/tests/CMakeLists.txt
@@ -3,14 +3,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/kdeeducore  )
 
 
 ########### next target ###############
-if(KDE4_BUILD_TESTS)
 set(loader_SRCS loader.cpp )
 
 kde4_automoc(${loader_SRCS})
 
-kde4_add_executable(loader ${loader_SRCS})
+kde4_add_test_executable(loader ${loader_SRCS})
 
 target_link_libraries(loader  ${KDE4_KDECORE_LIBS} kdeeducore )
 
-endif(KDE4_BUILD_TESTS)
-

diff --git a/libscience/tests/CMakeLists.txt b/libscience/tests/CMakeLists.txt
index ac832266cd77c76adf429813065dc7192f29e909..b9dc0c632b5502986cd8c40473104813d2e9f06c 100644 (file)
--- a/libscience/tests/CMakeLists.txt
+++ b/libscience/tests/CMakeLists.txt
@@ -1,15 +1,10 @@
-if(KDE4_BUILD_TESTS)
-
-# Tests don't need to go into toplevel/bin, they are fine in the current dir.
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 ########### next target ###############
 
 set(elementparsertest_SRCS xmlreadingtest.cpp)
 
-kde4_add_executable(elementparsertest ${elementparsertest_SRCS})
+kde4_add_test_executable(elementparsertest ${elementparsertest_SRCS})
 
 target_link_libraries(elementparsertest science)
 
@@ -17,10 +12,8 @@ target_link_libraries(elementparsertest science)
 
 set(isotopeparsertest_SRCS isotopereadingtest.cpp)
 
-kde4_add_executable(isotopeparsertest ${isotopeparsertest_SRCS})
+kde4_add_test_executable(isotopeparsertest ${isotopeparsertest_SRCS})
 
 target_link_libraries(isotopeparsertest science)
 
 
-endif(KDE4_BUILD_TESTS)
-