From: Pino Toscano Date: Wed, 4 Apr 2007 21:58:27 +0000 (+0000) Subject: move the test in an own subdir; no need to link to kdeui, kdecore is enough X-Git-Tag: v3.90.1~14 X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=4cf9af15a9900f243e26bd9e40ee787ad75a7a9d;p=libqmvoc.git move the test in an own subdir; no need to link to kdeui, kdecore is enough svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=650589 --- diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt index 7493561..a07f115 100644 --- a/libscience/CMakeLists.txt +++ b/libscience/CMakeLists.txt @@ -1,15 +1,10 @@ add_subdirectory(data) +add_subdirectory(tests) if(OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND) add_subdirectory(compoundviewer) endif(OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND) -#comment these lines out if you don't want to build the test -set(parsertest_SRCS xmlreadingtest.cpp) -kde4_add_executable(parsertest ${parsertest_SRCS}) -target_link_libraries(parsertest science) -#end tests - set(science_LIB_SRCS element.cpp spectrum.cpp @@ -27,7 +22,7 @@ kde4_automoc(${science_LIB_SRCS}) kde4_add_library(science SHARED ${science_LIB_SRCS}) -target_link_libraries(science ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ) +target_link_libraries(science ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} ) set_target_properties(science PROPERTIES VERSION 4.0.0 SOVERSION 4 ) install(TARGETS science DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libscience/tests/CMakeLists.txt b/libscience/tests/CMakeLists.txt new file mode 100644 index 0000000..b4de2bb --- /dev/null +++ b/libscience/tests/CMakeLists.txt @@ -0,0 +1,18 @@ +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(parsertest_SRCS xmlreadingtest.cpp) + +kde4_add_executable(parsertest ${parsertest_SRCS}) + +target_link_libraries(parsertest science) + + +endif(KDE4_BUILD_TESTS) + diff --git a/libscience/xmlreadingtest.cpp b/libscience/tests/xmlreadingtest.cpp similarity index 100% rename from libscience/xmlreadingtest.cpp rename to libscience/tests/xmlreadingtest.cpp