[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepimlibs/frameworks] kpimutils: Build the tests
From:       Christophe Giboudeaux <cgiboudeaux () gmx ! com>
Date:       2014-03-24 18:28:18
Message-ID: E1WS9be-0002Tf-VQ () scm ! kde ! org
[Download RAW message or body]

Git commit f2dc3c9a5161a6adba91ea4dcd748f5de80728bd by Christophe Giboudeau=
x.
Committed on 24/03/2014 at 18:29.
Pushed by cgiboudeaux into branch 'frameworks'.

Build the tests

M  +1    -1    kpimutils/CMakeLists.txt
M  +13   -14   kpimutils/autotests/CMakeLists.txt

http://commits.kde.org/kdepimlibs/f2dc3c9a5161a6adba91ea4dcd748f5de80728bd

diff --git a/kpimutils/CMakeLists.txt b/kpimutils/CMakeLists.txt
index d93d9da..e1c5dd4 100644
--- a/kpimutils/CMakeLists.txt
+++ b/kpimutils/CMakeLists.txt
@@ -33,7 +33,7 @@ endif()
 =

 ########### Targets ###########
 add_subdirectory(src)
-#add_subdirectory(autotests)
+add_subdirectory(autotests)
 =

 ########### CMake Config Files ###########
 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5PimUtils")
diff --git a/kpimutils/autotests/CMakeLists.txt b/kpimutils/autotests/CMake=
Lists.txt
index 0e57a4d..a254c77 100644
--- a/kpimutils/autotests/CMakeLists.txt
+++ b/kpimutils/autotests/CMakeLists.txt
@@ -1,24 +1,23 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 =

-include_directories(
-  ${CMAKE_SOURCE_DIR}/kpimutils
-  ${CMAKE_BINARY_DIR}/kpimutils
-)
+include(ECMMarkAsTest)
 =

-########### next target ###############
-
-set(testemail_SRCS testemail.cpp )
+find_package(Qt5Test CONFIG REQUIRED)
 =

+########### next target ###############
 =

-kde4_add_unit_test(testemail TESTNAME kpimutils-testemail  ${testemail_SRC=
S})
+set(testemail_SRCS testemail.cpp)
 =

-target_link_libraries(testemail ${KDE4_KDECORE_LIBS} kpimutils ${QT_QTTEST=
_LIBRARY} ${QT_QTGUI_LIBRARY})
+add_executable(testemail ${testemail_SRCS})
+add_test(testemail testemail)
+ecm_mark_as_test(testemail)
+target_link_libraries(testemail KF5PimUtils Qt5::Test)
 =

 ########### next target ###############
 =

-set(testlinklocator_SRCS testlinklocator.cpp )
-
-
-kde4_add_unit_test(testlinklocator TESTNAME kpimutils-testlinklocator  ${t=
estlinklocator_SRCS})
+set(testlinklocator_SRCS testlinklocator.cpp)
 =

-target_link_libraries(testlinklocator ${KDE4_KDECORE_LIBS} kpimutils ${QT_=
QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY})
+add_executable(testlinklocator ${testlinklocator_SRCS})
+add_test(testlinklocator testlinklocator)
+ecm_mark_as_test(testlinklocator)
+target_link_libraries(testlinklocator KF5PimUtils Qt5::Test)
[prev in list] [next in list] [prev in thread] [next in thread]