From dac6a6f5be711af11ea726a6032667c0b6384b94 Mon Sep 17 00:00:00 2001 From: Andreas Pakulat Date: Sun, 17 Jun 2007 21:15:00 +0000 Subject: [PATCH] Port to new kde4_add_*test* macros svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=676864 --- extdate/tests/CMakeLists.txt | 8 +++----- kdeeducore/tests/CMakeLists.txt | 5 +---- libscience/tests/CMakeLists.txt | 11 ++--------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/extdate/tests/CMakeLists.txt b/extdate/tests/CMakeLists.txt index 1aba207..37efad9 100644 --- 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 9d7774e..a139c25 100644 --- 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 ac83226..b9dc0c6 100644 --- 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) - -- 2.47.3