diff --git a/CMakeLists.txt b/CMakeLists.txt index b7954336f8..808f965c63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,752 +1,737 @@ project(krita) message(STATUS "Using CMake version: ${CMAKE_VERSION}") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(MIN_QT_VERSION 5.6.0) option(OVERRIDE_QT_VERSION "Use this to make it possible to build with Qt < 5.6.0. There will be bugs." OFF) if (OVERRIDE_QT_VERSION) set(MIN_QT_VERSION 5.4.0) endif() set(MIN_FRAMEWORKS_VERSION 5.7.0) if (POLICY CMP0002) cmake_policy(SET CMP0002 OLD) endif() if (POLICY CMP0017) cmake_policy(SET CMP0017 NEW) endif () if (POLICY CMP0022) cmake_policy(SET CMP0022 OLD) endif () if (POLICY CMP0026) cmake_policy(SET CMP0026 OLD) endif() if (POLICY CMP0042) cmake_policy(SET CMP0042 NEW) endif() if (POLICY CMP0046) cmake_policy(SET CMP0046 OLD) endif () if (POLICY CMP0059) cmake_policy(SET CMP0059 OLD) endif() if (POLICY CMP0063) cmake_policy(SET CMP0063 OLD) endif() if (POLICY CMP0054) cmake_policy(SET CMP0054 OLD) endif() if (POLICY CMP0064) cmake_policy(SET CMP0064 OLD) endif() if (APPLE) set(APPLE_SUPPRESS_X11_WARNING TRUE) set(KDE_SKIP_RPATH_SETTINGS TRUE) set(CMAKE_MACOSX_RPATH 1) set(BUILD_WITH_INSTALL_RPATH 1) add_definitions(-mmacosx-version-min=10.9 -Wno-deprecated-register) endif() -# QT5TODO: remove KDE4_BUILD_TESTS once all kde4_add_unit_test have been converted -# transitional forward compatibility: -# BUILD_TESTING is cmake standard, KDE4_BUILD_TESTS not used by ECM/KF5, but only -# macros in cmake/transitional. Just, Macros from cmake/transitional, -# incl. kde4_add_unit_test, are only picked up if no macros from kdelibs4 are installed, -# because that transitional path is appended. Prepending instead might possibly unwantedly -# mask ECM/KF5 macros. Not tested. -# So have BUILD_TESTING define KDE4_BUILD_TESTS. -if (BUILD_TESTING) - set(KDE4_BUILD_TESTS TRUE) -else() - set(KDE4_BUILD_TESTS FALSE) -endif() - ###################### ####################### ## Constants defines ## ####################### ###################### # define common versions of Krita applications, used to generate kritaversion.h # update these version for every release: set(KRITA_VERSION_STRING "3.0.92") set(KRITA_STABLE_VERSION_MAJOR 3) # 3 for 3.x, 4 for 4.x, etc. set(KRITA_STABLE_VERSION_MINOR 0) # 0 for 3.0, 1 for 3.1, etc. set(KRITA_VERSION_RELEASE 91) # 89 for Alpha, increase for next test releases, set 0 for first Stable, etc. #set(KRITA_ALPHA 1) # uncomment only for Alpha set(KRITA_BETA 1) # uncomment only for Beta #set(KRITA_RC 1) # uncomment only for RC set(KRITA_YEAR 2016) # update every year if(NOT DEFINED KRITA_ALPHA AND NOT DEFINED KRITA_BETA AND NOT DEFINED KRITA_RC) set(KRITA_STABLE 1) # do not edit endif() message(STATUS "Krita version: ${KRITA_VERSION_STRING}") # Define the generic version of the Krita libraries here # This makes it easy to advance it when the next Krita release comes. # 14 was the last GENERIC_KRITA_LIB_VERSION_MAJOR of the previous Krita series # (2.x) so we're starting with 15 in 3.x series. if(KRITA_STABLE_VERSION_MAJOR EQUAL 3) math(EXPR GENERIC_KRITA_LIB_VERSION_MAJOR "${KRITA_STABLE_VERSION_MINOR} + 15") else() # let's make sure we won't forget to update the "15" message(FATAL_ERROR "Reminder: please update offset == 15 used to compute GENERIC_KRITA_LIB_VERSION_MAJOR to something bigger") endif() set(GENERIC_KRITA_LIB_VERSION "${GENERIC_KRITA_LIB_VERSION_MAJOR}.0.0") set(GENERIC_KRITA_LIB_SOVERSION "${GENERIC_KRITA_LIB_VERSION_MAJOR}") LIST (APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") LIST (APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/kde_macro") # fetch git revision for the current build set(KRITA_GIT_SHA1_STRING "") set(KRITA_GIT_BRANCH_STRING "") include(GetGitRevisionDescription) get_git_head_revision(GIT_REFSPEC GIT_SHA1) get_git_branch(GIT_BRANCH) if(GIT_SHA1 AND GIT_BRANCH) string(SUBSTRING ${GIT_SHA1} 0 7 GIT_SHA1) set(KRITA_GIT_SHA1_STRING ${GIT_SHA1}) set(KRITA_GIT_BRANCH_STRING ${GIT_BRANCH}) endif() if(NOT DEFINED RELEASE_BUILD) # estimate mode by CMAKE_BUILD_TYPE content if not set on cmdline string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_TOLOWER) set(RELEASE_BUILD_TYPES "release" "relwithdebinfo" "minsizerel") list(FIND RELEASE_BUILD_TYPES "${CMAKE_BUILD_TYPE_TOLOWER}" INDEX) if (INDEX EQUAL -1) set(RELEASE_BUILD FALSE) else() set(RELEASE_BUILD TRUE) endif() endif() message(STATUS "Release build: ${RELEASE_BUILD}") ############ ############# ## Options ## ############# ############ option(PACKAGERS_BUILD "Build support of multiple CPU architectures in one binary. Should be used by packagers only or Krita developers. Only switch off when you're an artist optimizing a build for your very own machine." ON) if (WIN32) option(USE_DRMINGW "Support the Dr. Mingw crash handler (only on windows)" ON) endif () option(HIDE_SAFE_ASSERTS "Don't show message box for \"safe\" asserts, just ignore them automatically and dump a message to the terminal." ON) configure_file(config-hide-safe-asserts.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-hide-safe-asserts.h) option(FOUNDATION_BUILD "A Foundation build is a binary release build that can package some extra things like color themes. Linux distributions that build and install Krita into a default system location should not define this option to true." OFF) ####################### ######################## ## Productset setting ## ######################## ####################### # For predefined productsets see the definitions in KritaProducts.cmake and # in the files in the folder cmake/productsets. # Finding out the products & features to build is done in 5 steps: # 1. have the user define the products/features wanted, by giving a productset # 2. estimate all additional required products/features # 3. estimate which of the products/features can be build by external deps # 4. find which products/features have been temporarily disabled due to problems # 5. estimate which of the products/features can be build by internal deps # get the special macros include(CalligraProductSetMacros) include(MacroJPEG) include(GenerateTestExportHeader) # get the definitions of products, features and product sets include(KritaProducts.cmake) set(PRODUCTSET_DEFAULT "ALL") # temporary migration support if (CREATIVEONLY) set(WARN_ABOUT_CREATIVEONLY TRUE) set(PRODUCTSET_DEFAULT "CREATIVE") endif () if(NOT PRODUCTSET) set(PRODUCTSET ${PRODUCTSET_DEFAULT} CACHE STRING "Set of products/features to build" FORCE) endif() if (RELEASE_BUILD) set(CALLIGRA_SHOULD_BUILD_STAGING FALSE) else () set(CALLIGRA_SHOULD_BUILD_STAGING TRUE) endif () # finally choose products/features to build calligra_set_productset(${PRODUCTSET}) ######################## ######################### ## Look for KDE and Qt ## ######################### ######################## find_package(ECM 1.7.0 REQUIRED NOMODULE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(ECMOptionalAddSubdirectory) include(ECMAddAppIcon) include(ECMSetupVersion) include(ECMMarkNonGuiExecutable) include(ECMGenerateHeaders) include(GenerateExportHeader) include(ECMMarkAsTest) include(ECMInstallIcons) include(CMakePackageConfigHelpers) include(WriteBasicConfigVersionFile) include(CheckFunctionExists) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) include(FeatureSummary) -include(KDE4Macros) # do not reorder to be alphabetical: this is the order in which the frameworks # depend on each other. find_package(KF5 ${MIN_FRAMEWORKS_VERSION} REQUIRED COMPONENTS Archive Config WidgetsAddons Completion CoreAddons GuiAddons I18n ItemModels ItemViews WindowSystem ) # KConfig deprecated authorizeKAction. In order to be warning free, # compile with the updated function when the dependency is new enough. # Remove this (and the uses of the define) when the minimum KF5 # version is >= 5.24.0. if (${KF5Config_VERSION} VERSION_LESS "5.24.0" ) message("Old KConfig (< 5.24.0) found.") add_definitions(-DKCONFIG_BEFORE_5_24) endif() find_package(Qt5 ${MIN_QT_VERSION} REQUIRED COMPONENTS Core Gui Widgets Xml Network PrintSupport Svg Test Concurrent ) set(QT_QTTEST_LIBRARY Qt5::Test) include (MacroLibrary) include (MacroAdditionalCleanFiles) include (MacroAddFileDependencies) macro_ensure_out_of_source_build("Compiling Krita inside the source directory is not possible. Please refer to the build instruction https://community.kde.org/Krita#Build_Instructions") # Note: OPTIONAL_COMPONENTS does not seem to be reliable # (as of ECM 5.15.0, CMake 3.2) if (NOT WIN32 AND NOT APPLE) find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras) find_package(Qt5DBus ${MIN_QT_VERSION} QUIET) set(HAVE_DBUS ${Qt5DBus_FOUND}) set_package_properties(Qt5DBus PROPERTIES DESCRIPTION "Qt DBUS integration" URL "http://www.qt.io/" TYPE OPTIONAL PURPOSE "Optionally used to provide a dbus api on Linux") find_package(KF5KIO ${MIN_FRAMEWORKS_VERSION} QUIET) macro_bool_to_01(KF5KIO_FOUND HAVE_KIO) set_package_properties(KF5KIO PROPERTIES DESCRIPTION "KDE's KIO Framework" URL "http://api.kde.org/frameworks-api/frameworks5-apidocs/kio/html/index.html" TYPE OPTIONAL PURPOSE "Optionally used for recent document handling") find_package(KF5Crash ${MIN_FRAMEWORKS_VERSION} QUIET) macro_bool_to_01(KF5Crash_FOUND HAVE_KCRASH) set_package_properties(KF5Crash PROPERTIES DESCRIPTION "KDE's Crash Handler" URL "http://api.kde.org/frameworks-api/frameworks5-apidocs/kcrash/html/index.html" TYPE OPTIONAL PURPOSE "Optionally used to provide crash reporting on Linux") find_package(X11) if(X11_FOUND) find_package(Qt5 ${MIN_QT_VERSION} REQUIRED NO_MODULE COMPONENTS X11Extras) set(HAVE_X11 TRUE) add_definitions(-DHAVE_X11) else() set(HAVE_X11 FALSE) endif() find_package(XCB COMPONENTS XCB ATOM) if(XCB_FOUND) set(HAVE_XCB TRUE) else() set(HAVE_XCB FALSE) endif() else() set(HAVE_DBUS FALSE) set(HAVE_X11 FALSE) set(HAVE_XCB FALSE) endif() add_definitions( -DQT_USE_QSTRINGBUILDER -DQT_STRICT_ITERATORS -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -DQT_NO_URL_CAST_FROM_STRING -DQT_DISABLE_DEPRECATED_BEFORE=0 ) add_definitions(-DTRANSLATION_DOMAIN=\"krita\") # # The reason for this mode is that the Debug mode disable inlining # if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS_KRITADEVS "-O3 -g" CACHE STRING "" FORCE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals") endif() if(UNIX) set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};m") endif() if(WIN32) if(MSVC) # C4522: 'class' : multiple assignment operators specified set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4522") endif() endif() # enable exceptions globally kde_enable_exceptions() # only with this definition will all the FOO_TEST_EXPORT macro do something # TODO: check if this can be moved to only those places which make use of it, # to reduce global compiler definitions that would trigger a recompile of # everything on a change (like adding/removing tests to/from the build) if(BUILD_TESTING) add_definitions(-DCOMPILING_TESTS) endif() set(KRITA_DEFAULT_TEST_DATA_DIR ${CMAKE_SOURCE_DIR}/sdk/tests/data/) macro(macro_add_unittest_definitions) add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/") add_definitions(-DFILES_OUTPUT_DIR="${CMAKE_CURRENT_BINARY_DIR}") add_definitions(-DFILES_DEFAULT_DATA_DIR="${KRITA_DEFAULT_TEST_DATA_DIR}") endmacro() # overcome some platform incompatibilities if(WIN32) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/winquirks) add_definitions(-D_USE_MATH_DEFINES) add_definitions(-DNOMINMAX) set(WIN32_PLATFORM_NET_LIBS ws2_32.lib netapi32.lib) endif() # set custom krita plugin installdir set(KRITA_PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/kritaplugins) ########################### ############################ ## Required dependencies ## ############################ ########################### find_package(PNG REQUIRED) if (APPLE) # this is not added correctly on OSX -- see http://forum.kde.org/viewtopic.php?f=139&t=101867&p=221242#p221242 include_directories(SYSTEM ${PNG_INCLUDE_DIR}) endif() add_definitions(-DBOOST_ALL_NO_LIB) find_package(Boost REQUIRED COMPONENTS system) # for pigment and stage include_directories(${Boost_INCLUDE_DIRS}) ## ## Test for GNU Scientific Library ## find_package(GSL) set_package_properties(GSL PROPERTIES URL "http://www.gnu.org/software/gsl" TYPE RECOMMENDED PURPOSE "Required by Krita's Transform tool.") macro_bool_to_01(GSL_FOUND HAVE_GSL) configure_file(config-gsl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gsl.h ) ########################### ############################ ## Optional dependencies ## ############################ ########################### ## ## Check for OpenEXR ## find_package(ZLIB) set_package_properties(ZLIB PROPERTIES DESCRIPTION "Compression library" URL "http://www.zlib.net/" TYPE OPTIONAL PURPOSE "Optionally used by the G'Mic and the PSD plugins") macro_bool_to_01(ZLIB_FOUND HAVE_ZLIB) find_package(OpenEXR) set_package_properties(OpenEXR PROPERTIES DESCRIPTION "High dynamic-range (HDR) image file format" URL "http://www.openexr.com" TYPE OPTIONAL PURPOSE "Required by the Krita OpenEXR filter") macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR) set(LINK_OPENEXR_LIB) if(OPENEXR_FOUND) include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR}) set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES}) add_definitions(${OPENEXR_DEFINITIONS}) endif() find_package(TIFF) set_package_properties(TIFF PROPERTIES DESCRIPTION "TIFF Library and Utilities" URL "http://www.remotesensing.org/libtiff" TYPE OPTIONAL PURPOSE "Required by the Krita TIFF filter") find_package(JPEG) set_package_properties(JPEG PROPERTIES DESCRIPTION "Free library for JPEG image compression. Note: libjpeg8 is NOT supported." URL "http://www.libjpeg-turbo.org" TYPE OPTIONAL PURPOSE "Required by the Krita JPEG filter") set(LIBRAW_MIN_VERSION "0.16") find_package(LibRaw ${LIBRAW_MIN_VERSION}) set_package_properties(LibRaw PROPERTIES DESCRIPTION "Library to decode RAW images" URL "http://www.libraw.org" TYPE OPTIONAL PURPOSE "Required to build the raw import plugin") find_package(FFTW3) set_package_properties(FFTW3 PROPERTIES DESCRIPTION "A fast, free C FFT library" URL "http://www.fftw.org/" TYPE OPTIONAL PURPOSE "Required by the Krita for fast convolution operators and some G'Mic features") macro_bool_to_01(FFTW3_FOUND HAVE_FFTW3) find_package(OCIO) set_package_properties(OCIO PROPERTIES DESCRIPTION "The OpenColorIO Library" URL "http://www.opencolorio.org" TYPE OPTIONAL PURPOSE "Required by the Krita LUT docker") macro_bool_to_01(OCIO_FOUND HAVE_OCIO) ## ## Look for OpenGL ## # TODO: see if there is a better check for QtGui being built with opengl support (and thus the QOpenGL* classes) if(Qt5Gui_OPENGL_IMPLEMENTATION) message(STATUS "Found QtGui OpenGL support") else() message(FATAL_ERROR "Did NOT find QtGui OpenGL support. Check your Qt configuration. You cannot build Krita without Qt OpenGL support.") endif() ## ## Test for eigen3 ## find_package(Eigen3 REQUIRED "3.0") set_package_properties(Eigen3 PROPERTIES DESCRIPTION "C++ template library for linear algebra" URL "http://eigen.tuxfamily.org" TYPE REQUIRED) ## ## Test for exiv2 ## set(EXIV2_MIN_VERSION "0.16") find_package(Exiv2 REQUIRED) set_package_properties(Exiv2 PROPERTIES DESCRIPTION "Image metadata library and tools" URL "http://www.exiv2.org" PURPOSE "Required by Krita") ## ## Test for lcms ## find_package(LCMS2 REQUIRED "2.4") set_package_properties(LCMS2 PROPERTIES DESCRIPTION "LittleCMS Color management engine" URL "http://www.littlecms.com" TYPE REQUIRED PURPOSE "Will be used for color management and is necessary for Krita") if(LCMS2_FOUND) if(NOT ${LCMS2_VERSION} VERSION_LESS 2040 ) set(HAVE_LCMS24 TRUE) endif() set(HAVE_REQUIRED_LCMS_VERSION TRUE) set(HAVE_LCMS2 TRUE) endif() ## ## Test for Vc ## set(OLD_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) set(HAVE_VC FALSE) if( NOT MSVC) find_package(Vc 1.1.0) set_package_properties(Vc PROPERTIES DESCRIPTION "Portable, zero-overhead SIMD library for C++" URL "https://github.com/VcDevel/Vc" TYPE OPTIONAL PURPOSE "Required by the Krita for vectorization") macro_bool_to_01(Vc_FOUND HAVE_VC) macro_bool_to_01(PACKAGERS_BUILD DO_PACKAGERS_BUILD) endif() configure_file(config-vc.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-vc.h ) if(HAVE_VC) message(STATUS "Vc found!") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/vc") include (VcMacros) if(Vc_COMPILER_IS_CLANG) set(ADDITIONAL_VC_FLAGS "-Wabi -ffp-contract=fast -fPIC") elseif (NOT MSVC) set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast -fPIC") endif() #Handle Vc master if(Vc_COMPILER_IS_GCC OR Vc_COMPILER_IS_CLANG) AddCompilerFlag("-std=c++11" _ok) if(NOT _ok) AddCompilerFlag("-std=c++0x" _ok) endif() endif() macro(ko_compile_for_all_implementations_no_scalar _objs _src) if(PACKAGERS_BUILD) vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} ONLY SSE2 SSSE3 SSE4_1 AVX AVX2+FMA+BMI2) else() set(${_objs} ${_src}) endif() endmacro() macro(ko_compile_for_all_implementations _objs _src) if(PACKAGERS_BUILD) vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} ONLY Scalar SSE2 SSSE3 SSE4_1 AVX AVX2+FMA+BMI2) else() set(${_objs} ${_src}) endif() endmacro() if (NOT PACKAGERS_BUILD) # Optimize everything for the current architecture set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}") endif () endif() set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} ) ## ## Test for Xinput ## if(NOT WIN32 AND NOT APPLE) set(REQUIRED_Xinput_FOUND ${X11_Xinput_FOUND}) else() set(REQUIRED_Xinput_FOUND TRUE) endif() -add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS}) +add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS}) if(WIN32) set(LIB_INSTALL_DIR ${LIB_INSTALL_DIR} RUNTIME DESTINATION ${BIN_INSTALL_DIR} LIBRARY ${INSTALL_TARGETS_DEFAULT_ARGS} ARCHIVE ${INSTALL_TARGETS_DEFAULT_ARGS} ) endif() ## ## Test endianess ## include (TestBigEndian) test_big_endian(CMAKE_WORDS_BIGENDIAN) ## ## Test for qt-poppler ## find_package(Poppler) set_package_properties(Poppler PROPERTIES DESCRIPTION "A PDF rendering library" URL "http://poppler.freedesktop.org" TYPE OPTIONAL PURPOSE "Required by the Krita PDF filter.") ## ## Test for pthreads (for G'Mic) ## find_package(Threads) set_package_properties(Threads PROPERTIES DESCRIPTION "PThreads - A low-level threading library" TYPE OPTIONAL PURPOSE "Optionally used by the G'Mic plugin") ## ## Test for OpenMP (for G'Mic) ## find_package(OpenMP) set_package_properties(OpenMP PROPERTIES DESCRIPTION "A low-level parallel execution library" URL "http://openmp.org/wp/" TYPE OPTIONAL PURPOSE "Optionally used by the G'Mic plugin") ## ## Test for Curl (for G'Mic) ## find_package(CURL) set_package_properties(CURL PROPERTIES DESCRIPTION "A tool to fetch remote data" URL "http://curl.haxx.se/" TYPE OPTIONAL PURPOSE "Optionally used by the G'Mic plugin") ############################ ############################# ## Add Krita helper macros ## ############################# ############################ include(MacroKritaAddBenchmark) #################### ##################### ## Define includes ## ##################### #################### # for config.h and includes (if any?) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/interfaces ) include_directories( ${CMAKE_SOURCE_DIR}/libs/version ${CMAKE_BINARY_DIR}/libs/version ) ################################################### #################################################### ## Detect which products/features can be compiled ## #################################################### ################################################### calligra_drop_product_on_bad_condition( APP_KRITA EIGEN3_FOUND "Eigen devel not found" EXIV2_FOUND "libexiv2 devel not found" HAVE_REQUIRED_LCMS_VERSION "lcms devel not found" Boost_SYSTEM_FOUND "boost-system devel not found" REQUIRED_Xinput_FOUND "Xinput devel not found " ) ############################################# #### Backward compatibility BUILD_x=off #### ############################################# # workaround: disable directly all products which might be activated by internal # dependencies, but belong to scope of old flag calligra_drop_products_on_old_flag(krita APP_KRITA) ############################################# #### Temporarily broken products #### ############################################# # If a product does not build due to some temporary brokeness disable it here, # by calling calligra_disable_product with the product id and the reason, # e.g.: # calligra_disable_product(APP_KEXI "isn't buildable at the moment") ############################################# #### Calculate buildable products #### ############################################# calligra_drop_unbuildable_products() ################### #################### ## Subdirectories ## #################### ################### if(SHOULD_BUILD_APP_KRITA) add_subdirectory(krita) endif() # non-app directories are moved here because they can depend on SHOULD_BUILD_{appname} variables set above add_subdirectory(libs) add_subdirectory(plugins) add_subdirectory( benchmarks ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) calligra_product_deps_report("product_deps") calligra_log_should_build() configure_file(KoConfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/KoConfig.h ) configure_file(config_convolution.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_convolution.h) configure_file(config-ocio.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ocio.h ) check_function_exists(powf HAVE_POWF) configure_file(config-powf.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-powf.h) diff --git a/cmake/kde_macro/KDE4Macros.cmake b/cmake/kde_macro/KDE4Macros.cmake deleted file mode 100644 index 73b34a4f94..0000000000 --- a/cmake/kde_macro/KDE4Macros.cmake +++ /dev/null @@ -1,563 +0,0 @@ -# for documentation look at FindKDE4Internal.cmake - -# this file contains the following macros (or functions): -# KDE4_ADD_UI_FILES -# KDE4_ADD_UI3_FILES -# KDE4_ADD_KCFG_FILES -# _KDE4_SET_CUSTOM_TARGET_PROPERTY -# _KDE4_GET_CUSTOM_TARGET_PROPERTY -# KDE4_ADD_PLUGIN -# KDE4_ADD_KDEINIT_EXECUTABLE -# KDE4_ADD_UNIT_TEST -# KDE4_ADD_EXECUTABLE -# KDE4_ADD_WIDGET_FILES -# KDE4_UPDATE_ICONCACHE -# KDE4_INSTALL_ICONS -# KDE4_REMOVE_OBSOLETE_CMAKE_FILES -# KDE4_CREATE_HANDBOOK -# KDE4_ADD_APP_ICON -# KDE4_CREATE_MANPAGE -# KDE4_CREATE_BASIC_CMAKE_VERSION_FILE (function) -# KDE4_INSTALL_AUTH_HELPER_FILES -# KDE4_AUTH_INSTALL_ACTIONS - -# Copyright (c) 2006-2009 Alexander Neundorf, -# Copyright (c) 2006, 2007, Laurent Montel, -# Copyright (c) 2007 Matthias Kretz -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -set(KDE4_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR} ) - -# This macro doesn't set up the RPATH related options for executables anymore, -# since now (wioth cmake 2.6) just the full RPATH is used always for everything. -# It does create wrapper shell scripts for the executables. -# It overrides the defaults set in FindKDE4Internal.cmake. -# For every executable a wrapper script is created, which sets the appropriate -# environment variable for the platform (LD_LIBRARY_PATH on most UNIX systems, -# DYLD_LIBRARY_PATH on OS X and PATH in Windows) so that it points to the built -# but not yet installed versions of the libraries. So if RPATH is disabled, the executables -# can be run via these scripts from the build tree and will find the correct libraries. -# If RPATH is not disabled, these scripts are also used but only for consistency, because -# they don't really influence anything then, because the compiled-in RPATH overrides -# the LD_LIBRARY_PATH env. variable. -macro (KDE4_HANDLE_RPATH_FOR_EXECUTABLE _target_NAME) - if (UNIX) - if (APPLE) - set(_library_path_variable "DYLD_LIBRARY_PATH") - elseif (CYGWIN) - set(_library_path_variable "PATH") - else (APPLE) - set(_library_path_variable "LD_LIBRARY_PATH") - endif (APPLE) - - if (APPLE) - # DYLD_LIBRARY_PATH does not work like LD_LIBRARY_PATH - # OSX already has the RPATH in libraries and executables, putting runtime directories in - # DYLD_LIBRARY_PATH actually breaks things - set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/:${KDE4_LIB_DIR}") - else (APPLE) - set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/:${LIB_INSTALL_DIR}:${KDE4_LIB_DIR}:${QT_LIBRARY_DIR}") - endif (APPLE) - get_target_property(_executable ${_target_NAME} LOCATION ) - - # use add_custom_target() to have the sh-wrapper generated during build time instead of cmake time - add_custom_command(TARGET ${_target_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} - -D_filename=${_executable}.shell -D_library_path_variable=${_library_path_variable} - -D_ld_library_path="${_ld_library_path}" -D_executable=$ - -P ${KDE4_MODULE_DIR}/kde4_exec_via_sh.cmake - ) - - macro_additional_clean_files(${_executable}.shell) - - # under UNIX, set the property WRAPPER_SCRIPT to the name of the generated shell script - # so it can be queried and used later on easily - set_target_properties(${_target_NAME} PROPERTIES WRAPPER_SCRIPT ${_executable}.shell) - - else (UNIX) - # under windows, set the property WRAPPER_SCRIPT just to the name of the executable - # maybe later this will change to a generated batch file (for setting the PATH so that the Qt libs are found) - get_target_property(_executable ${_target_NAME} LOCATION ) - set_target_properties(${_target_NAME} PROPERTIES WRAPPER_SCRIPT ${_executable}) - - set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}\;${LIB_INSTALL_DIR}\;${KDE4_LIB_DIR}\;${QT_LIBRARY_DIR}") - get_target_property(_executable ${_target_NAME} LOCATION ) - - # use add_custom_target() to have the batch-file-wrapper generated during build time instead of cmake time - add_custom_command(TARGET ${_target_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} - -D_filename="${_executable}.bat" - -D_ld_library_path="${_ld_library_path}" -D_executable="${_executable}" - -P ${KDE4_MODULE_DIR}/kde4_exec_via_sh.cmake - ) - - endif (UNIX) -endmacro (KDE4_HANDLE_RPATH_FOR_EXECUTABLE) - - -macro (KDE4_ADD_PLUGIN _target_NAME ) -#if the first argument is "WITH_PREFIX" then keep the standard "lib" prefix, -#otherwise set the prefix empty - - set(_args ${ARGN}) - # default to module - set(_add_lib_param "MODULE") - set(_with_pre FALSE) - - foreach(arg ${_args}) - if (arg STREQUAL "WITH_PREFIX") - set(_with_pre TRUE) - endif (arg STREQUAL "WITH_PREFIX") - if (arg STREQUAL "STATIC") - set(_add_lib_param STATIC) - endif (arg STREQUAL "STATIC") - if (arg STREQUAL "SHARED") - set(_add_lib_param SHARED) - endif (arg STREQUAL "SHARED") - if (arg STREQUAL "MODULE") - set(_add_lib_param MODULE) - endif (arg STREQUAL "MODULE") - endforeach(arg) - - if(_with_pre) - list(REMOVE_ITEM _args "WITH_PREFIX") - endif(_with_pre) - if(_add_lib_param STREQUAL "STATIC") - list(REMOVE_ITEM _args "STATIC") - endif(_add_lib_param STREQUAL "STATIC") - if (_add_lib_param STREQUAL "SHARED") - list(REMOVE_ITEM _args "SHARED") - endif (_add_lib_param STREQUAL "SHARED") - if (_add_lib_param STREQUAL "MODULE") - list(REMOVE_ITEM _args "MODULE") - endif (_add_lib_param STREQUAL "MODULE") - - set(_SRCS ${_args}) - - if("${_add_lib_param}" STREQUAL "STATIC") - add_definitions(-DQT_STATICPLUGIN) - endif("${_add_lib_param}" STREQUAL "STATIC") - - add_library(${_target_NAME} ${_add_lib_param} ${_SRCS}) - - if (NOT _with_pre) - set_target_properties(${_target_NAME} PROPERTIES PREFIX "") - endif (NOT _with_pre) - - # for shared libraries/plugins a -DMAKE_target_LIB is required - string(TOUPPER ${_target_NAME} _symbol) - string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol}) - set(_symbol "MAKE_${_symbol}_LIB") - set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol}) - -endmacro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) - - -# this macro is intended to check whether a list of source -# files has the "NOGUI" or "RUN_UNINSTALLED" keywords at the beginning -# in _output_LIST the list of source files is returned with the "NOGUI" -# and "RUN_UNINSTALLED" keywords removed -# if "NOGUI" is in the list of files, the _nogui argument is set to -# "NOGUI" (which evaluates to TRUE in cmake), otherwise it is set empty -# (which evaluates to FALSE in cmake) -# "RUN_UNINSTALLED" in the list of files is ignored, it is not necessary anymore -# since KDE 4.2 (with cmake 2.6.2), since then all executables are always built -# with RPATH pointing into the build dir. -# if "TEST" is in the list of files, the _test argument is set to -# "TEST" (which evaluates to TRUE in cmake), otherwise it is set empty -# (which evaluates to FALSE in cmake) -macro(KDE4_CHECK_EXECUTABLE_PARAMS _output_LIST _nogui _test) - set(${_nogui}) - set(${_test}) - set(${_output_LIST} ${ARGN}) - list(LENGTH ${_output_LIST} count) - - list(GET ${_output_LIST} 0 first_PARAM) - - set(second_PARAM "NOTFOUND") - if (${count} GREATER 1) - list(GET ${_output_LIST} 1 second_PARAM) - endif (${count} GREATER 1) - - set(remove "NOTFOUND") - - if (${first_PARAM} STREQUAL "NOGUI") - set(${_nogui} "NOGUI") - set(remove 0) - endif (${first_PARAM} STREQUAL "NOGUI") - - if (${first_PARAM} STREQUAL "RUN_UNINSTALLED") - set(remove 0) - endif (${first_PARAM} STREQUAL "RUN_UNINSTALLED") - - if (${first_PARAM} STREQUAL "TEST") - set(${_test} "TEST") - set(remove 0) - endif (${first_PARAM} STREQUAL "TEST") - - if (${second_PARAM} STREQUAL "NOGUI") - set(${_nogui} "NOGUI") - set(remove 0;1) - endif (${second_PARAM} STREQUAL "NOGUI") - - if (${second_PARAM} STREQUAL "RUN_UNINSTALLED") - set(remove 0;1) - endif (${second_PARAM} STREQUAL "RUN_UNINSTALLED") - - if (${second_PARAM} STREQUAL "TEST") - set(${_test} "TEST") - set(remove 0;1) - endif (${second_PARAM} STREQUAL "TEST") - - - if (NOT "${remove}" STREQUAL "NOTFOUND") - list(REMOVE_AT ${_output_LIST} ${remove}) - endif (NOT "${remove}" STREQUAL "NOTFOUND") - -endmacro(KDE4_CHECK_EXECUTABLE_PARAMS) - - -macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME ) - - kde4_check_executable_params(_SRCS _nogui _test ${ARGN}) - - configure_file(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp PROPERTIES SKIP_AUTOMOC TRUE) - # under Windows, build a normal executable and additionally a dummy kdeinit4_foo.lib, whose only purpose on windows is to - # keep the linking logic from the CMakeLists.txt on UNIX working (under UNIX all necessary libs are linked against the kdeinit - # library instead against the executable, under windows we want to have everything in the executable, but for compatibility we have to - # keep the library there- - if(WIN32) - if (MINGW) - list(FIND _SRCS ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_res.o _res_position) - else(MINGW) - list(FIND _SRCS ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}.rc _res_position) - endif(MINGW) - if(NOT _res_position EQUAL -1) - list(GET _SRCS ${_res_position} _resourcefile) - list(REMOVE_AT _SRCS ${_res_position}) - endif(NOT _res_position EQUAL -1) - - set(_KDEINIT4_TARGET_NAME_ ${_target_NAME}) - string(REGEX REPLACE "[-]" "_" _KDEINIT4_TARGET_NAME_ "${_KDEINIT4_TARGET_NAME_}") - configure_file(${KDE4_MODULE_DIR}/kde4init_win32lib_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_win32lib_dummy.cpp) - add_library(kdeinit_${_target_NAME} STATIC ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_win32lib_dummy.cpp) - - kde4_add_executable(${_target_NAME} "${_nogui}" ${_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile}) - - set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME kdeinit4_${_target_NAME}) - - target_link_libraries(${_target_NAME} kdeinit_${_target_NAME}) - else(WIN32) - - add_library(kdeinit_${_target_NAME} SHARED ${_SRCS}) - - set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME kdeinit4_${_target_NAME}) - - if (Q_WS_MAC) - list(FIND _SRCS *.icns _icon_position) - if(NOT _res_position EQUAL -1) - list(GET _SRCS ${_icon_position} _resourcefile) - endif(NOT _res_position EQUAL -1) - endif (Q_WS_MAC) - kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile}) - target_link_libraries(${_target_NAME} kdeinit_${_target_NAME}) - endif(WIN32) - -endmacro (KDE4_ADD_KDEINIT_EXECUTABLE) - -# Add a unit test, which is executed when running make test . -# The targets are always created, but only built for the "all" -# target if the option KDE4_BUILD_TESTS is enabled. Otherwise the rules for the target -# are created but not built by default. You can build them by manually building the target. -# The name of the target can be specified using TESTNAME , if it is not given -# the macro will default to the -macro (KDE4_ADD_UNIT_TEST _test_NAME) - set(_srcList ${ARGN}) - set(_targetName ${_test_NAME}) - if( ${ARGV1} STREQUAL "TESTNAME" ) - set(_targetName ${ARGV2}) - list(REMOVE_AT _srcList 0 1) - endif( ${ARGV1} STREQUAL "TESTNAME" ) - - set(_nogui) - list(GET _srcList 0 first_PARAM) - if( ${first_PARAM} STREQUAL "NOGUI" ) - set(_nogui "NOGUI") - endif( ${first_PARAM} STREQUAL "NOGUI" ) - - kde4_add_executable( ${_test_NAME} TEST ${_srcList} ) - - if(NOT KDE4_TEST_OUTPUT) - set(KDE4_TEST_OUTPUT plaintext) - endif(NOT KDE4_TEST_OUTPUT) - set(KDE4_TEST_OUTPUT ${KDE4_TEST_OUTPUT} CACHE STRING "The output to generate when running the QTest unit tests") - - set(using_qtest "") - foreach(_filename ${_srcList}) - if(NOT using_qtest) - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_filename}") - file(READ ${_filename} file_CONTENT) - string(REGEX MATCH "QTEST_(KDE)?MAIN" using_qtest "${file_CONTENT}") - endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_filename}") - endif(NOT using_qtest) - endforeach(_filename) - - get_target_property( loc ${_test_NAME} LOCATION ) - if(WIN32) - if(MSVC_IDE) - STRING(REGEX REPLACE "\\$\\(.*\\)" "\${CTEST_CONFIGURATION_TYPE}" loc "${loc}") - endif() - # .bat because of rpath handling - set(_executable "${loc}.bat") - else(WIN32) - if (Q_WS_MAC AND NOT _nogui) - set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}.app/Contents/MacOS/${_test_NAME}) - else (Q_WS_MAC AND NOT _nogui) - # .shell because of rpath handling - set(_executable "${loc}.shell") - endif (Q_WS_MAC AND NOT _nogui) - endif(WIN32) - - if (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") - #MESSAGE(STATUS "${_targetName} : Using QTestLib, can produce XML report.") - add_test( ${_targetName} ${_executable} -xml -o ${_targetName}.tml) - else (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") - #MESSAGE(STATUS "${_targetName} : NOT using QTestLib, can't produce XML report, please use QTestLib to write your unit tests.") - add_test( ${_targetName} ${_executable} ) - endif (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") - -# add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_test_NAME}.tml ) - - if (NOT MSVC_IDE) #not needed for the ide - # if the tests are EXCLUDE_FROM_ALL, add a target "buildtests" to build all tests - if (NOT KDE4_BUILD_TESTS) - get_directory_property(_buildtestsAdded BUILDTESTS_ADDED) - if(NOT _buildtestsAdded) - add_custom_target(buildtests) - set_directory_properties(PROPERTIES BUILDTESTS_ADDED TRUE) - endif(NOT _buildtestsAdded) - add_dependencies(buildtests ${_test_NAME}) - endif (NOT KDE4_BUILD_TESTS) - endif (NOT MSVC_IDE) - -endmacro (KDE4_ADD_UNIT_TEST) - - -# -# The samme as KDE4_ADD_UNIT_TEST, but it doesn't add the test. It's built, -# you can run it, but it won't make the buildbot sad. -# -macro (KDE4_ADD_BROKEN_UNIT_TEST _test_NAME) - set(_srcList ${ARGN}) - set(_targetName ${_test_NAME}) - if( ${ARGV1} STREQUAL "TESTNAME" ) - set(_targetName ${ARGV2}) - list(REMOVE_AT _srcList 0 1) - endif( ${ARGV1} STREQUAL "TESTNAME" ) - - set(_nogui) - list(GET _srcList 0 first_PARAM) - if( ${first_PARAM} STREQUAL "NOGUI" ) - set(_nogui "NOGUI") - endif( ${first_PARAM} STREQUAL "NOGUI" ) - - kde4_add_executable( ${_test_NAME} TEST ${_srcList} ) - - if(NOT KDE4_TEST_OUTPUT) - set(KDE4_TEST_OUTPUT plaintext) - endif(NOT KDE4_TEST_OUTPUT) - set(KDE4_TEST_OUTPUT ${KDE4_TEST_OUTPUT} CACHE STRING "The output to generate when running the QTest unit tests") - - set(using_qtest "") - foreach(_filename ${_srcList}) - if(NOT using_qtest) - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_filename}") - file(READ ${_filename} file_CONTENT) - string(REGEX MATCH "QTEST_(KDE)?MAIN" using_qtest "${file_CONTENT}") - endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_filename}") - endif(NOT using_qtest) - endforeach(_filename) - - get_target_property( loc ${_test_NAME} LOCATION ) - if(WIN32) - if(MSVC_IDE) - STRING(REGEX REPLACE "\\$\\(.*\\)" "\${CTEST_CONFIGURATION_TYPE}" loc "${loc}") - endif() - # .bat because of rpath handling - set(_executable "${loc}.bat") - else(WIN32) - if (Q_WS_MAC AND NOT _nogui) - set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}.app/Contents/MacOS/${_test_NAME}) - else (Q_WS_MAC AND NOT _nogui) - # .shell because of rpath handling - set(_executable "${loc}.shell") - endif (Q_WS_MAC AND NOT _nogui) - endif(WIN32) - - # Carefully not add the test! - - if (NOT MSVC_IDE) #not needed for the ide - # if the tests are EXCLUDE_FROM_ALL, add a target "buildtests" to build all tests - if (NOT KDE4_BUILD_TESTS) - get_directory_property(_buildtestsAdded BUILDTESTS_ADDED) - if(NOT _buildtestsAdded) - add_custom_target(buildtests) - set_directory_properties(PROPERTIES BUILDTESTS_ADDED TRUE) - endif(NOT _buildtestsAdded) - add_dependencies(buildtests ${_test_NAME}) - endif (NOT KDE4_BUILD_TESTS) - endif (NOT MSVC_IDE) - - - MESSAGE(" * Unittest " ${_test_NAME} " is broken!") -endmacro (KDE4_ADD_BROKEN_UNIT_TEST) - - -# add a manifest file to executables. -# -# There is a henn-egg problem when a target runtime part is renamed using -# the OUTPUT_NAME option of cmake's set_target_properties command. -# -# At now the Makefiles rules creating for manifest adding are performed -# *after* the cmake's add_executable command but *before* an optional -# set_target_properties command. -# This means that in KDE4_ADD_MANIFEST the LOCATION property contains -# the unchanged runtime part name of the target. :-( -# -# The recently used workaround is to specify a variable build off the target name followed -# by _OUTPUT_NAME before calling kde4_add_executable as shown in the following example: -# -# set(xyz_OUTPUT_NAME test) -# kde4_add_executable( xyz ) -# set_target_properties( xyz PROPERTIES OUTPUT_NAME ${xyz_OUTPUT_NAME} ) -# -# The full solution would be to introduce a kde4_target_link_libraries macro and to -# call KDE4_ADD_MANIFEST inside instead of calling in kde4_add_executable. -# This would require patching of *all* places in the KDE sources where target_link_libraries -# is used and to change the related docs. -# -# Because yet I found only 2 locations where this problem occurs (kjs, k3b), the workaround -# seems to be a pragmatically solution. -# -# This macro is an internal macro only used by kde4_add_executable -# -macro (_KDE4_ADD_MANIFEST _target_NAME) - set(x ${_target_NAME}_OUTPUT_NAME) - if (${x}) - get_target_property(_var ${_target_NAME} LOCATION ) - string(REPLACE "${_target_NAME}" "${${x}}" _executable ${_var}) - else(${x}) - get_target_property(_executable ${_target_NAME} LOCATION ) - endif(${x}) - - if (_kdeBootStrapping) - set(_cmake_module_path ${CMAKE_SOURCE_DIR}/cmake/modules) - else (_kdeBootStrapping) - set(_cmake_module_path ${KDE4_INSTALL_DIR}/share/apps/cmake/modules) - endif (_kdeBootStrapping) - - set(_manifest ${KDE4_MODULE_DIR}/Win32.Manifest.in) - #message(STATUS ${_executable} ${_manifest}) - add_custom_command( - TARGET ${_target_NAME} - POST_BUILD - COMMAND ${KDE4_MT_EXECUTABLE} - ARGS - -manifest ${_manifest} - -updateresource:${_executable} - COMMENT "adding vista trustInfo manifest to ${_target_NAME}" - ) -endmacro(_KDE4_ADD_MANIFEST) - - -macro (KDE4_ADD_EXECUTABLE _target_NAME) - - kde4_check_executable_params( _SRCS _nogui _test ${ARGN}) - - set(_add_executable_param) - - # determine additional parameters for add_executable() - # for GUI apps, create a bundle on OSX - if (Q_WS_MAC) - set(_add_executable_param MACOSX_BUNDLE) - endif (Q_WS_MAC) - - # for GUI apps, this disables the additional console under Windows - if (WIN32) - set(_add_executable_param WIN32) - endif (WIN32) - - if (_nogui) - set(_add_executable_param) - endif (_nogui) - - if (_test AND NOT KDE4_BUILD_TESTS) - set(_add_executable_param ${_add_executable_param} EXCLUDE_FROM_ALL) - endif (_test AND NOT KDE4_BUILD_TESTS) - - add_executable(${_target_NAME} ${_add_executable_param} ${_SRCS}) - - IF (KDE4_ENABLE_UAC_MANIFEST) - _kde4_add_manifest(${_target_NAME}) - ENDIF(KDE4_ENABLE_UAC_MANIFEST) - - if (_test) - set_target_properties(${_target_NAME} PROPERTIES COMPILE_FLAGS -DKDESRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\"") - endif (_test) - - kde4_handle_rpath_for_executable(${_target_NAME}) - -endmacro (KDE4_ADD_EXECUTABLE) - -include(GenerateExportHeader) - -macro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE) - - set(_first_SRC ${_lib_TYPE}) - set(_add_lib_param) - - if (${_lib_TYPE} STREQUAL "STATIC") - set(_first_SRC) - set(_add_lib_param STATIC) - endif (${_lib_TYPE} STREQUAL "STATIC") - if (${_lib_TYPE} STREQUAL "SHARED") - set(_first_SRC) - set(_add_lib_param SHARED) - endif (${_lib_TYPE} STREQUAL "SHARED") - if (${_lib_TYPE} STREQUAL "MODULE") - set(_first_SRC) - set(_add_lib_param MODULE) - endif (${_lib_TYPE} STREQUAL "MODULE") - - set(_SRCS ${_first_SRC} ${ARGN}) - - add_library(${_target_NAME} ${_add_lib_param} ${_SRCS}) - - # for shared libraries a -DMAKE_target_LIB is required - string(TOUPPER ${_target_NAME} _symbol) - string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol}) - set(_symbol "MAKE_${_symbol}_LIB") - set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol}) -endmacro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE) - -macro(kf5_add_library _target_NAME _lib_TYPE) - kde4_add_library(${_target_NAME} ${_lib_TYPE} ${ARGN}) - generate_export_header(${_target_NAME}) -endmacro() - -# TODO: Move this to kde4support -#if (_kdeBootStrapping) -# include("${CMAKE_SOURCE_DIR}/tier2/kauth/cmake/KAuthMacros.cmake") -# include("${CMAKE_SOURCE_DIR}/kdecore/KDECoreMacros.cmake") - include("${CMAKE_SOURCE_DIR}/cmake/kde_macro/KDEUIMacros.cmake") -# include("${CMAKE_SOURCE_DIR}/kdoctools/KDocToolsMacros.cmake") -#else() -#include("${KDE4_LIB_DIR}/cmake/KAuth/KAuthMacros.cmake") -# include("${CMAKE_CURRENT_LIST_DIR}/KDECoreMacros.cmake") -# include("${CMAKE_CURRENT_LIST_DIR}/KDEUIMacros.cmake") -# include("${CMAKE_CURRENT_LIST_DIR}/KDocToolsMacros.cmake") -#endif() diff --git a/cmake/modules/KritaAddBrokenUnitTest.cmake b/cmake/modules/KritaAddBrokenUnitTest.cmake new file mode 100644 index 0000000000..e22fc1454a --- /dev/null +++ b/cmake/modules/KritaAddBrokenUnitTest.cmake @@ -0,0 +1,47 @@ +include(CMakeParseArguments) +include(ECMMarkAsTest) +include(ECMMarkNonGuiExecutable) + + +# modified version of ECMAddTests.cmake in cmake-extra-modules +function(KRITA_ADD_BROKEN_UNIT_TEST) + set(options GUI) + # TARGET_NAME_VAR and TEST_NAME_VAR are undocumented args used by + # ecm_add_tests + set(oneValueArgs TEST_NAME NAME_PREFIX TARGET_NAME_VAR TEST_NAME_VAR) + set(multiValueArgs LINK_LIBRARIES) + cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + set(_sources ${ARG_UNPARSED_ARGUMENTS}) + list(LENGTH _sources _sourceCount) + if(ARG_TEST_NAME) + set(_targetname ${ARG_TEST_NAME}) + elseif(${_sourceCount} EQUAL "1") + #use the source file name without extension as the testname + get_filename_component(_targetname ${_sources} NAME_WE) + else() + #more than one source file passed, but no test name given -> error + message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"") + endif() + + set(_testname ${ARG_NAME_PREFIX}${_targetname}) + MESSAGE(" * Unittest " ${_testname} " is broken!") + + set(gui_args) + if(ARG_GUI) + set(gui_args WIN32 MACOSX_BUNDLE) + endif() + add_executable(${_targetname} ${gui_args} ${_sources}) + if(NOT ARG_GUI) + ecm_mark_nongui_executable(${_targetname}) + endif() + # do not add it as test, so make test skips it! + # add_test(NAME ${_testname} COMMAND ${_targetname}) + target_link_libraries(${_targetname} ${ARG_LINK_LIBRARIES}) + ecm_mark_as_test(${_targetname}) + if (ARG_TARGET_NAME_VAR) + set(${ARG_TARGET_NAME_VAR} "${_targetname}" PARENT_SCOPE) + endif() + if (ARG_TEST_NAME_VAR) + set(${ARG_TEST_NAME_VAR} "${_testname}" PARENT_SCOPE) + endif() +endfunction() diff --git a/cmake/modules/MacroKritaAddBenchmark.cmake b/cmake/modules/MacroKritaAddBenchmark.cmake index 05ddb4b6d4..84669a0f43 100644 --- a/cmake/modules/MacroKritaAddBenchmark.cmake +++ b/cmake/modules/MacroKritaAddBenchmark.cmake @@ -1,82 +1,83 @@ # Copyright (c) 2010, Cyrille Berger, # Copyright (c) 2006-2009 Alexander Neundorf, # Copyright (c) 2006, 2007, Laurent Montel, # Copyright (c) 2007 Matthias Kretz # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. add_custom_target(benchmark) macro (KRITA_ADD_BENCHMARK _test_NAME) set(_srcList ${ARGN}) set(_targetName ${_test_NAME}) if( ${ARGV1} STREQUAL "TESTNAME" ) set(_targetName ${ARGV2}) list(REMOVE_AT _srcList 0 1) endif() set(_nogui) list(GET ${_srcList} 0 first_PARAM) if( ${first_PARAM} STREQUAL "NOGUI" ) set(_nogui "NOGUI") endif() - kde4_add_executable( ${_test_NAME} TEST ${_srcList} ) + add_executable( ${_test_NAME} ${_srcList} ) + ecm_mark_as_test(${_test_NAME}) if(NOT KDE4_TEST_OUTPUT) set(KDE4_TEST_OUTPUT plaintext) endif() set(KDE4_TEST_OUTPUT ${KDE4_TEST_OUTPUT} CACHE STRING "The output to generate when running the QTest unit tests") set(using_qtest "") foreach(_filename ${_srcList}) if(NOT using_qtest) if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_filename}") file(READ ${_filename} file_CONTENT) string(REGEX MATCH "QTEST_(KDE)?MAIN" using_qtest "${file_CONTENT}") endif() endif() endforeach(_filename) get_target_property( loc ${_test_NAME} LOCATION ) if(WIN32) if(MSVC_IDE) string(REGEX REPLACE "\\$\\(.*\\)" "\${CTEST_CONFIGURATION_TYPE}" loc "${loc}") endif() # .bat because of rpath handling set(_executable "${loc}.bat") else() if (Q_WS_MAC AND NOT _nogui) set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}.app/Contents/MacOS/${_test_NAME}) else () # .shell because of rpath handling set(_executable "${loc}.shell") endif () endif() if (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") #MESSAGE(STATUS "${_targetName} : Using QTestLib, can produce XML report.") add_custom_target( ${_targetName} COMMAND ${_executable} -xml -o ${_targetName}.tml ) else () #MESSAGE(STATUS "${_targetName} : NOT using QTestLib, can't produce XML report, please use QTestLib to write your unit tests.") add_custom_target( ${_targetName} COMMAND ${_executable} ) endif () add_dependencies(benchmark ${_targetName} ) # add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_test_NAME}.tml ) if (NOT MSVC_IDE) #not needed for the ide # if the tests are EXCLUDE_FROM_ALL, add a target "buildtests" to build all tests if (NOT BUILD_TESTING) get_directory_property(_buildtestsAdded BUILDTESTS_ADDED) if(NOT _buildtestsAdded) add_custom_target(buildtests) set_directory_properties(PROPERTIES BUILDTESTS_ADDED TRUE) endif() add_dependencies(buildtests ${_test_NAME}) endif () endif () endmacro (KRITA_ADD_BENCHMARK) diff --git a/libs/brush/tests/CMakeLists.txt b/libs/brush/tests/CMakeLists.txt index 4e84636983..1458e253b0 100644 --- a/libs/brush/tests/CMakeLists.txt +++ b/libs/brush/tests/CMakeLists.txt @@ -1,44 +1,30 @@ ########### next target ############### set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_SOURCE_DIR}/libs/image/metadata ${CMAKE_SOURCE_DIR}/sdk/tests ) include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR} ) if(HAVE_VC) include_directories(SYSTEM ${Vc_INCLUDE_DIR} ) endif() - - macro_add_unittest_definitions() -########### next target ############### - -set(kis_auto_brush_test_SRCS kis_auto_brush_test.cpp ) -kde4_add_unit_test(KisAutoBrushTest TESTNAME krita-libbrush-KisAutoBrushTest ${kis_auto_brush_test_SRCS}) -target_link_libraries(KisAutoBrushTest kritaimage kritalibbrush Qt5::Test) - -########### next target ############### - -set(kis_gbr_brush_test_SRCS kis_gbr_brush_test.cpp ) -kde4_add_unit_test(KisGbrBrushTest TESTNAME krita-libbrush-KisGbrBrushTest ${kis_gbr_brush_test_SRCS}) -target_link_libraries(KisGbrBrushTest kritaimage kritalibbrush Qt5::Test) - -########### next target ############### - -set(kis_boundary_test_SRCS kis_boundary_test.cpp ) -kde4_add_unit_test(KisBoundaryTest TESTNAME krita-libbrush-KisBoundaryTest ${kis_boundary_test_SRCS}) -target_link_libraries(KisBoundaryTest kritaimage kritalibbrush Qt5::Test) +include(ECMAddTests) -########### next target ############### +ecm_add_tests( + kis_auto_brush_test.cpp + kis_gbr_brush_test.cpp + kis_boundary_test.cpp + kis_imagepipe_brush_test.cpp + NAME_PREFIX "krita-libbrush-" + LINK_LIBRARIES kritaimage kritalibbrush Qt5::Test +) -set(kis_imagepipe_brush_test_SRCS kis_imagepipe_brush_test.cpp ) -kde4_add_unit_test(KisImagePipeBrushTest TESTNAME krita-libbrush-KisImagePipeBrushTest ${kis_imagepipe_brush_test_SRCS}) -target_link_libraries(KisImagePipeBrushTest kritaimage kritalibbrush Qt5::Test) diff --git a/libs/flake/tests/CMakeLists.txt b/libs/flake/tests/CMakeLists.txt index 75b7e17ea2..25d0e1f3ed 100644 --- a/libs/flake/tests/CMakeLists.txt +++ b/libs/flake/tests/CMakeLists.txt @@ -1,151 +1,59 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) -########### next target ############### - -set(TestPosition_test_SRCS TestPosition.cpp ) -kde4_add_unit_test(TestPosition TESTNAME libs-kritaflake-TestPosition ${TestPosition_test_SRCS}) -target_link_libraries(TestPosition kritaflake Qt5::Test) - -########### next target ############### - -set(TestSelection_test_SRCS TestSelection.cpp ) -kde4_add_unit_test(TestSelection TESTNAME libs-kritaflake-TestSelection ${TestSelection_test_SRCS}) -target_link_libraries(TestSelection kritaflake Qt5::Test) - -########### next target ############### - -set(TestPathShape_test_SRCS TestPathShape.cpp ) -kde4_add_broken_unit_test(TestPathShape TESTNAME libs-kritaflake-TestPathShape ${TestPathShape_test_SRCS}) -target_link_libraries(TestPathShape kritaflake Qt5::Test) - -########### next target ############### - -set(TestPathTool_test_SRCS TestPathTool.cpp ) -kde4_add_unit_test(TestPathTool TESTNAME libs-kritaflake-TestPathTool ${TestPathTool_test_SRCS}) -target_link_libraries(TestPathTool kritaflake Qt5::Test) - -########### next target ############### - -set(TestControlPointMoveCommand_test_SRCS TestControlPointMoveCommand.cpp ) -kde4_add_broken_unit_test(TestControlPointMoveCommand TESTNAME libs-kritaflake-TestControlPointMoveCommand ${TestControlPointMoveCommand_test_SRCS}) -target_link_libraries(TestControlPointMoveCommand kritaflake Qt5::Test) - -########### next target ############### - -set(TestPointTypeCommand_test_SRCS TestPointTypeCommand.cpp ) -kde4_add_broken_unit_test(TestPointTypeCommand TESTNAME libs-kritaflake-TestPointTypeCommand ${TestPointTypeCommand_test_SRCS}) -target_link_libraries(TestPointTypeCommand kritaflake Qt5::Test) - -########### next target ############### - -set(TestPointRemoveCommand_test_SRCS TestPointRemoveCommand.cpp ) -kde4_add_broken_unit_test(TestPointRemoveCommand TESTNAME libs-kritaflake-TestPointRemoveCommand ${TestPointRemoveCommand_test_SRCS}) -target_link_libraries(TestPointRemoveCommand kritaflake Qt5::Test) - -########### next target ############### - -set(TestRemoveSubpathCommand_test_SRCS TestRemoveSubpathCommand.cpp ) -kde4_add_broken_unit_test(TestRemoveSubpathCommand TESTNAME libs-kritaflake-TestRemoveSubpathCommand ${TestRemoveSubpathCommand_test_SRCS}) -target_link_libraries(TestRemoveSubpathCommand kritaflake Qt5::Test) - -########### next target ############### - -set(TestShapeAt_test_SRCS TestShapeAt.cpp ) -kde4_add_unit_test(TestShapeAt TESTNAME libs-kritaflake-TestShapeAt ${TestShapeAt_test_SRCS}) -target_link_libraries(TestShapeAt kritaflake Qt5::Test) - -########### next target ############### - -set(TestShapePaint_test_SRCS TestShapePainting.cpp ) -kde4_add_unit_test(TestShapePainting TESTNAME libs-kritaflake-TestShapePainting ${TestShapePaint_test_SRCS}) -target_link_libraries(TestShapePainting kritaflake Qt5::Test) - -########### next target ############### - -set(TestKoShapeFactory_test_SRCS TestKoShapeFactory.cpp ) -kde4_add_unit_test(TestKoShapeFactory TESTNAME libs-kritaflake-TestKoShapeFactory ${TestKoShapeFactory_test_SRCS}) -target_link_libraries(TestKoShapeFactory kritaflake Qt5::Test) - -########### next target ############### - -set(TestKoShapeRegistry_test_SRCS TestKoShapeRegistry.cpp ) -kde4_add_unit_test(TestKoShapeRegistry TESTNAME libs-kritaflake-TestKoShapeRegistry ${TestKoShapeRegistry_test_SRCS}) -target_link_libraries(TestKoShapeRegistry kritaflake Qt5::Test) - -########### end ############### - -set(TestShapeContainer_test_SRCS TestShapeContainer.cpp ) -kde4_add_unit_test(TestShapeContainer TESTNAME libs-kritaflake-TestShapeContainer ${TestShapeContainer_test_SRCS}) -target_link_libraries(TestShapeContainer kritaflake Qt5::Test) - -########### end ############### - -set(TestShapeGroupCommand_test_SRCS TestShapeGroupCommand.cpp ) -kde4_add_unit_test(TestShapeGroupCommand TESTNAME libs-kritaflake-TestShapeGroupCommand ${TestShapeGroupCommand_test_SRCS}) -target_link_libraries(TestShapeGroupCommand kritaflake Qt5::Test) - -########### end ############### - -set(TestShapeReorderCommand_test_SRCS TestShapeReorderCommand.cpp ) -kde4_add_unit_test(TestShapeReorderCommand TESTNAME libs-kritaflake-TestShapeReorderCommand ${TestShapeReorderCommand_test_SRCS}) -target_link_libraries(TestShapeReorderCommand kritaflake Qt5::Test) - -########### next target ############### - -set(TestPathSegment_test_SRCS TestPathSegment.cpp ) -kde4_add_broken_unit_test(TestPathSegment TESTNAME libs-kritaflake-TestPathSegment ${TestPathSegment_test_SRCS}) -target_link_libraries(TestPathSegment kritaflake Qt5::Test) - -########### next target ############### - -set(TestImageCollection_test_SRCS TestImageCollection.cpp ) -kde4_add_unit_test(TestImageCollection TESTNAME libs-kritaflake-TestImageCollection ${TestImageCollection_test_SRCS}) -target_link_libraries(TestImageCollection kritaflake Qt5::Test) - -########### next target ############### - -set(TestCanvasResourceProvider_test_SRCS TestResourceManager.cpp ) -kde4_add_unit_test(TestResourceManager TESTNAME libs-kritaflake-TestResourceManager ${TestCanvasResourceProvider_test_SRCS}) -target_link_libraries(TestResourceManager kritaflake Qt5::Test) - -########### end ############### - -set(TestShapeBackgroundCommand_test_SRCS TestShapeBackgroundCommand.cpp ) -kde4_add_unit_test(TestShapeBackgroundCommand TESTNAME libs-kritaflake-TestShapeBackgroundCommand ${TestShapeBackgroundCommand_test_SRCS}) -target_link_libraries(TestShapeBackgroundCommand kritaflake Qt5::Test) - -########### end ############### - -set(TestShapeStrokeCommand_test_SRCS TestShapeStrokeCommand.cpp ) -kde4_add_unit_test(TestShapeStrokeCommand TESTNAME libs-kritaflake-TestShapeStrokeCommand ${TestShapeStrokeCommand_test_SRCS}) -target_link_libraries(TestShapeStrokeCommand kritaflake Qt5::Test) - -########### end ############### - -set(TestShapeShadowCommand_test_SRCS TestShapeShadowCommand.cpp ) -kde4_add_unit_test(TestShapeShadowCommand TESTNAME libs-kritaflake-TestShapeShadowCommand ${TestShapeShadowCommand_test_SRCS}) -target_link_libraries(TestShapeShadowCommand kritaflake Qt5::Test) - -########### end ############### - -set(TestSegmentTypeCommand_test_SRCS TestSegmentTypeCommand.cpp ) -kde4_add_broken_unit_test(TestSegmentTypeCommand TESTNAME libs-kritaflake-TestSegmentTypeCommand ${TestSegmentTypeCommand_test_SRCS}) -target_link_libraries(TestSegmentTypeCommand kritaflake Qt5::Test) - -########### end ############### - -set(TestPointMergeCommand_test_SRCS TestPointMergeCommand.cpp ) -kde4_add_broken_unit_test(TestPointMergeCommand TESTNAME libs-kritaflake-TestPointMergeCommand ${TestPointMergeCommand_test_SRCS}) -target_link_libraries(TestPointMergeCommand kritaflake Qt5::Test) - -########### end ############### - -set(TestInputDevice_test_SRCS TestInputDevice.cpp ) -kde4_add_unit_test(TestInputDevice TESTNAME libs-kritaflake-TestInputDevice ${TestInputDevice_test_SRCS}) -target_link_libraries(TestInputDevice kritaflake Qt5::Test) - -########### end ############### - -set(TestSnapStrategy_test_SRCS TestSnapStrategy.cpp ) -kde4_add_unit_test(TestSnapStrategy TESTNAME libs-kritaflake-TestSnapStrategy ${TestSnapStrategy_test_SRCS}) -target_link_libraries(TestSnapStrategy kritaflake Qt5::Test) +include(ECMAddTests) +include(KritaAddBrokenUnitTest) + +macro_add_unittest_definitions() + +ecm_add_tests( + TestPosition.cpp + TestSelection.cpp + TestPathTool.cpp + TestShapeAt.cpp + TestShapePainting.cpp + TestKoShapeFactory.cpp + TestKoShapeRegistry.cpp + TestShapeContainer.cpp + TestShapeGroupCommand.cpp + TestShapeReorderCommand.cpp + TestImageCollection.cpp + TestResourceManager.cpp + TestShapeBackgroundCommand.cpp + TestShapeStrokeCommand.cpp + TestShapeShadowCommand.cpp + TestInputDevice.cpp + TestSnapStrategy.cpp + NAME_PREFIX "libs-kritaflake-" + LINK_LIBRARIES kritaflake Qt5::Test) + +krita_add_broken_unit_test(TestPathShape.cpp + TEST_NAME libs-kritaflake-TestPathShape + LINK_LIBRARIES kritaflake Qt5::Test) + +krita_add_broken_unit_test(TestControlPointMoveCommand.cpp + TEST_NAME libs-kritaflake-TestControlPointMoveCommand + LINK_LIBRARIES kritaflake Qt5::Test) + +krita_add_broken_unit_test(TestPointTypeCommand.cpp + TEST_NAME libs-kritaflake-TestPointTypeCommand + LINK_LIBRARIES kritaflake Qt5::Test) + +krita_add_broken_unit_test(TestPointRemoveCommand.cpp + TEST_NAME libs-kritaflake-TestPointRemoveCommand + LINK_LIBRARIES kritaflake Qt5::Test) + +krita_add_broken_unit_test(TestRemoveSubpathCommand.cpp + TEST_NAME libs-kritaflake-TestRemoveSubpathCommand + LINK_LIBRARIES kritaflake Qt5::Test) + +krita_add_broken_unit_test(TestPathSegment.cpp + TEST_NAME libs-kritaflake-TestPathSegment + LINK_LIBRARIES kritaflake Qt5::Test) + +krita_add_broken_unit_test(TestSegmentTypeCommand.cpp + TEST_NAME libs-kritaflake-TestSegmentTypeCommand + LINK_LIBRARIES kritaflake Qt5::Test) + +krita_add_broken_unit_test(TestPointMergeCommand.cpp + TEST_NAME libs-kritaflake-TestPointMergeCommand + LINK_LIBRARIES kritaflake Qt5::Test) diff --git a/libs/flake/tests/TestImageCollection.cpp b/libs/flake/tests/TestImageCollection.cpp index 483ca8e097..e495ad04d5 100644 --- a/libs/flake/tests/TestImageCollection.cpp +++ b/libs/flake/tests/TestImageCollection.cpp @@ -1,249 +1,249 @@ /* * This file is part of Calligra tests * * Copyright (C) 2006-2010 Thomas Zander * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "TestImageCollection.h" #include #include #include #include #include #include #include #include #include void TestImageCollection::testGetImageImage() { KoImageCollection collection; - QImage image(KDESRCDIR "/logo-calligra.png"); + QImage image(FILES_DATA_DIR "logo-calligra.png"); KoImageData *id1 = collection.createImageData(image); QCOMPARE(id1->hasCachedImage(), true); QCOMPARE(id1->suffix(), QString("png")); KoImageData *id2 = collection.createImageData(image); QCOMPARE(id2->hasCachedImage(), true); QCOMPARE(id1->priv(), id2->priv()); KoImageData *id3 = collection.createImageData(image); QCOMPARE(id3->hasCachedImage(), true); QCOMPARE(id1->key(), id3->key()); QCOMPARE(id1->priv(), id3->priv()); - QImage image2(KDESRCDIR "/logo-kpresenter.png"); + QImage image2(FILES_DATA_DIR "logo-kpresenter.png"); KoImageData *id4 = collection.createImageData(image2); QCOMPARE(id4->hasCachedImage(), true); QVERIFY(id1->key() != id4->key()); QCOMPARE(collection.count(), 2); delete id4; QCOMPARE(id1->hasCachedImage(), true); QCOMPARE(id2->hasCachedImage(), true); QCOMPARE(id3->hasCachedImage(), true); QCOMPARE(collection.count(), 1); delete id1; QCOMPARE(id2->hasCachedImage(), true); QCOMPARE(id3->hasCachedImage(), true); QCOMPARE(collection.size(), 1); delete id2; QCOMPARE(id3->hasCachedImage(), true); QCOMPARE(collection.size(), 1); delete id3; QCOMPARE(collection.size(), 0); // add an image bigger than the allowed size to be held in memory QImage hugeImage(500, 500, QImage::Format_RGB32); KoImageData *id5 = collection.createImageData(hugeImage); delete id5; } void TestImageCollection::testGetImageStore() { KoImageCollection collection; - KoStore *store = KoStore::createStore(KDESRCDIR "/store.zip", KoStore::Read); + KoStore *store = KoStore::createStore(FILES_DATA_DIR "store.zip", KoStore::Read); QString image("logo-calligra.jpg"); KoImageData *id1 = collection.createImageData(image, store); QCOMPARE(id1->suffix(), QString("jpg")); QCOMPARE(id1->hasCachedImage(), false); KoImageData *id2 = collection.createImageData(image, store); QCOMPARE(id2->hasCachedImage(), false); QCOMPARE(id1->priv(), id2->priv()); QCOMPARE(id1->key(), id2->key()); QCOMPARE(collection.count(), 1); delete store; } void TestImageCollection::testInvalidImageData() { KoImageCollection collection; QByteArray invalidImageData(100, '^'); KoImageData *data = collection.createImageData(invalidImageData); QVERIFY(data); QVERIFY(!data->isValid()); QVERIFY(data->errorCode() == KoImageData::OpenFailed); QCOMPARE(collection.count(), 1); QBuffer storedData; QVERIFY(!data->saveData(storedData)); // should fail if QIODevice is closed storedData.open(QIODevice::WriteOnly); QVERIFY(data->saveData(storedData)); QCOMPARE(invalidImageData, storedData.buffer()); delete data; } void TestImageCollection::testImageDataAsSharedData() { KoImageData data; QCOMPARE(data.isValid(), false); QImage image(100, 101, QImage::Format_RGB32); data.setImage(image); QCOMPARE(data.isValid(), true); QCOMPARE(data.hasCachedImage(), true); QCOMPARE(data.image(), image); KoImageData data2(data); QCOMPARE(data, data2); QCOMPARE(data.isValid(), true); QCOMPARE(data.image(), image); QCOMPARE(data2.isValid(), true); QCOMPARE(data2.image(), image); { KoImageData data3; data3 = data; QCOMPARE(data3.isValid(), true); QCOMPARE(data3.image(), image); } QCOMPARE(data, data2); QCOMPARE(data.isValid(), true); QCOMPARE(data.image(), image); QCOMPARE(data2.isValid(), true); QCOMPARE(data2.image(), image); KoImageData empty; KoImageData second(empty); } void TestImageCollection::testPreload1() { KoImageData data; QImage image(100, 102, QImage::Format_RGB32); data.setImage(image); QCOMPARE(data.hasCachedImage(), true); QCOMPARE(data.hasCachedPixmap(), false); QPixmap pixmap = data.pixmap(QSize(40, 41)); QCOMPARE(pixmap.width(), 40); QCOMPARE(pixmap.height(), 41); QCOMPARE(data.hasCachedPixmap(), true); QPixmap pixmap2 = data.pixmap(QSize(40, 41)); QCOMPARE(pixmap.cacheKey(), pixmap2.cacheKey()); QPixmap pixmap3 = data.pixmap(); QCOMPARE(pixmap.cacheKey(), pixmap3.cacheKey()); QCOMPARE(data.hasCachedImage(), true); } void TestImageCollection::testPreload3() { KoImageData data; - KoStore *store = KoStore::createStore(KDESRCDIR "/store.zip", KoStore::Read); + KoStore *store = KoStore::createStore(FILES_DATA_DIR "store.zip", KoStore::Read); QString image("logo-calligra.png"); data.setImage(image, store); QCOMPARE(data.hasCachedImage(), true); // the png is tiny.. Its kept in memory. QCOMPARE(data.hasCachedPixmap(), false); QPixmap pixmap = data.pixmap(QSize(40, 41)); QCOMPARE(pixmap.width(), 40); QCOMPARE(pixmap.height(), 41); QCOMPARE(data.hasCachedPixmap(), true); QCOMPARE(data.hasCachedImage(), true); QPixmap pixmap2 = data.pixmap(QSize(40, 41)); QCOMPARE(pixmap.cacheKey(), pixmap2.cacheKey()); QPixmap pixmap3 = data.pixmap(); QCOMPARE(pixmap.cacheKey(), pixmap3.cacheKey()); // now get a differen size; QPixmap pixmap4 = data.pixmap(QSize(10, 12)); QCOMPARE(pixmap.width(), 40); QCOMPARE(pixmap.height(), 41); QCOMPARE(pixmap4.width(), 10); QCOMPARE(pixmap4.height(), 12); QVERIFY(pixmap.cacheKey() != pixmap4.cacheKey()); QPixmap pixmap5 = data.pixmap(); QCOMPARE(pixmap5.cacheKey(), pixmap4.cacheKey()); } void TestImageCollection::testSameKey() { - KoStore *store = KoStore::createStore(KDESRCDIR "/store.zip", KoStore::Read); + KoStore *store = KoStore::createStore(FILES_DATA_DIR "store.zip", KoStore::Read); QString image("logo-calligra.png"); KoImageData data; data.setImage(image, store); KoImageData data2; data2.setImage(image, store); QCOMPARE(data.key(), data2.key()); - QFile file(KDESRCDIR "/logo-calligra.png"); + QFile file(FILES_DATA_DIR "logo-calligra.png"); file.open(QIODevice::ReadOnly); QByteArray imageData = file.readAll(); KoImageData data3; data3.setImage(imageData); QCOMPARE(data.key(), data3.key()); QCOMPARE(data2.key(), data3.key()); - QImage qImage1(KDESRCDIR "/logo-calligra.png"); - QImage qImage2(KDESRCDIR "/logo-calligra.png"); + QImage qImage1(FILES_DATA_DIR "logo-calligra.png"); + QImage qImage2(FILES_DATA_DIR "logo-calligra.png"); KoImageData data4; data4.setImage(qImage1); KoImageData data5; data5.setImage(qImage2); QCOMPARE(data4.key(), data5.key()); - QImage qImage3(KDESRCDIR "/logo-calligra-big.png"); - QImage qImage4(KDESRCDIR "/logo-calligra-big.png"); + QImage qImage3(FILES_DATA_DIR "/logo-calligra-big.png"); + QImage qImage4(FILES_DATA_DIR "/logo-calligra-big.png"); KoImageData data6; data6.setImage(qImage3); KoImageData data7; data7.setImage(qImage4); QCOMPARE(data6.key(), data7.key()); // should reset the key so it's the same as data6 data2.setImage(qImage3); QCOMPARE(data2.key(), data7.key()); } void TestImageCollection::testIsValid() { KoImageData data; QCOMPARE(data.isValid(), false); QImage image(100, 102, QImage::Format_RGB32); data.setImage(image); QCOMPARE(data.isValid(), true); QByteArray bytes("foo"); data.setImage(bytes); // obviously not a correct image. QCOMPARE(data.isValid(), false); } QTEST_MAIN(TestImageCollection) diff --git a/libs/flake/tests/logo-calligra-big.png b/libs/flake/tests/data/logo-calligra-big.png similarity index 100% rename from libs/flake/tests/logo-calligra-big.png rename to libs/flake/tests/data/logo-calligra-big.png diff --git a/libs/flake/tests/logo-calligra.jpg b/libs/flake/tests/data/logo-calligra.jpg similarity index 100% rename from libs/flake/tests/logo-calligra.jpg rename to libs/flake/tests/data/logo-calligra.jpg diff --git a/libs/flake/tests/logo-calligra.png b/libs/flake/tests/data/logo-calligra.png similarity index 100% rename from libs/flake/tests/logo-calligra.png rename to libs/flake/tests/data/logo-calligra.png diff --git a/libs/flake/tests/logo-kpresenter.png b/libs/flake/tests/data/logo-kpresenter.png similarity index 100% rename from libs/flake/tests/logo-kpresenter.png rename to libs/flake/tests/data/logo-kpresenter.png diff --git a/libs/flake/tests/store.zip b/libs/flake/tests/data/store.zip similarity index 100% rename from libs/flake/tests/store.zip rename to libs/flake/tests/data/store.zip diff --git a/libs/image/tests/CMakeLists.txt b/libs/image/tests/CMakeLists.txt index 98cea7a6cd..7b1b5db024 100644 --- a/libs/image/tests/CMakeLists.txt +++ b/libs/image/tests/CMakeLists.txt @@ -1,699 +1,237 @@ # cmake in some versions for some not yet known reasons fails to run automoc # on random targets (changing target names already has an effect) # As temporary workaround skipping build of tests on these versions for now # See https://mail.kde.org/pipermail/kde-buildsystem/2015-June/010819.html # extend range of affected cmake versions as needed if(NOT ${CMAKE_VERSION} VERSION_LESS 3.1.3 AND NOT ${CMAKE_VERSION} VERSION_GREATER 3.2.3) message(WARNING "Skipping krita/image/tests, CMake in at least versions 3.1.3 - 3.2.3 seems to have a problem with automoc. \n(FRIENDLY REMINDER: PLEASE DON'T BREAK THE TESTS!)") set (HAVE_FAILING_CMAKE TRUE) else() set (HAVE_FAILING_CMAKE FALSE) endif() include_directories( ${CMAKE_SOURCE_DIR}/libs/image/metadata ${CMAKE_BINARY_DIR}/libs/image/ ${CMAKE_SOURCE_DIR}/libs/image/ ${CMAKE_SOURCE_DIR}/libs/image/brushengine ${CMAKE_SOURCE_DIR}/libs/image/tiles3 ${CMAKE_SOURCE_DIR}/libs/image/tiles3/swap ${CMAKE_SOURCE_DIR}/sdk/tests ) include_Directories(SYSTEM ${EIGEN3_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ) if(HAVE_VC) include_directories(${Vc_INCLUDE_DIR}) endif() +include(ECMAddTests) +include(KritaAddBrokenUnitTest) + macro_add_unittest_definitions() set(KisRandomGeneratorDemoSources kis_random_generator_demo.cpp kimageframe.cpp) ki18n_wrap_ui(KisRandomGeneratorDemoSources kis_random_generator_demo.ui) -kde4_add_executable(KisRandomGeneratorDemo ${KisRandomGeneratorDemoSources}) -target_link_libraries(KisRandomGeneratorDemo kritaimage ) - -########### next target ############### +add_executable(KisRandomGeneratorDemo ${KisRandomGeneratorDemoSources}) +target_link_libraries(KisRandomGeneratorDemo kritaimage) +ecm_mark_as_test(${KisRandomGeneratorDemoSources}) + +ecm_add_tests( + kis_base_node_test.cpp + kis_fast_math_test.cpp + kis_node_test.cpp + kis_node_facade_test.cpp + kis_fixed_paint_device_test.cpp + kis_layer_test.cpp + kis_effect_mask_test.cpp + kis_iterator_test.cpp + kis_painter_test.cpp + kis_selection_test.cpp + kis_count_visitor_test.cpp + kis_projection_test.cpp + kis_properties_configuration_test.cpp + kis_transaction_test.cpp + kis_pixel_selection_test.cpp + kis_group_layer_test.cpp + kis_paint_layer_test.cpp + kis_adjustment_layer_test.cpp + kis_annotation_test.cpp + kis_change_profile_visitor_test.cpp + kis_clone_layer_test.cpp + kis_colorspace_convert_visitor_test.cpp + kis_convolution_painter_test.cpp + kis_crop_processing_visitor_test.cpp + kis_processing_applicator_test.cpp + kis_datamanager_test.cpp + kis_fill_painter_test.cpp + kis_filter_configuration_test.cpp + kis_filter_test.cpp + kis_filter_processing_information_test.cpp + kis_filter_registry_test.cpp + kis_filter_strategy_test.cpp + kis_gradient_painter_test.cpp + kis_image_commands_test.cpp + kis_image_test.cpp + kis_image_signal_router_test.cpp + kis_iterators_ng_test.cpp + kis_iterator_benchmark.cpp + kis_updater_context_test.cpp + kis_simple_update_queue_test.cpp + kis_stroke_test.cpp + kis_simple_stroke_strategy_test.cpp + kis_stroke_strategy_undo_command_based_test.cpp + kis_strokes_queue_test.cpp + kis_macro_test.cpp + kis_mask_test.cpp + kis_math_toolbox_test.cpp + kis_name_server_test.cpp + kis_node_commands_test.cpp + kis_node_graph_listener_test.cpp + kis_node_visitor_test.cpp + kis_paint_information_test.cpp + kis_paintop_test.cpp + kis_pattern_test.cpp + kis_recorded_action_factory_registry_test.cpp + kis_recorded_action_test.cpp + kis_recorded_filter_action_test.cpp + kis_selection_mask_test.cpp + kis_shared_ptr_test.cpp + kis_bsplines_test.cpp + kis_warp_transform_worker_test.cpp + kis_liquify_transform_worker_test.cpp + kis_transparency_mask_test.cpp + kis_types_test.cpp + kis_vec_test.cpp + kis_filter_config_widget_test.cpp + kis_mask_generator_test.cpp + kis_cubic_curve_test.cpp + kis_node_query_path_test.cpp + kis_fixed_point_maths_test.cpp + kis_filter_weights_buffer_test.cpp + kis_filter_weights_applicator_test.cpp + kis_fill_interval_test.cpp + kis_fill_interval_map_test.cpp + kis_scanline_fill_test.cpp + kis_psd_layer_style_test.cpp + kis_layer_style_projection_plane_test.cpp + kis_lod_capable_layer_offset_test.cpp + kis_algebra_2d_test.cpp + kis_marker_painter_test.cpp + kis_lazy_brush_test.cpp + kis_colorize_mask_test.cpp + + NAME_PREFIX "krita-image-" + LINK_LIBRARIES kritaimage Qt5::Test) + + +ecm_add_test(kis_layer_style_filter_environment_test.cpp + TEST_NAME kritaimage-layer_style_filter_environment_test + LINK_LIBRARIES ${KDE4_KDEUI_LIBS} kritaimage Qt5::Test) + +ecm_add_test(kis_asl_parser_test.cpp + TEST_NAME kritalibpsd-asl_parser_test + LINK_LIBRARIES kritapsd kritapigment kritawidgetutils Qt5::Xml Qt5::Test) + +# ecm_add_test(kis_dom_utils_test.cpp +# TEST_NAME krita-image-DomUtils-Test +# LINK_LIBRARIES kritaimage Qt5::Test) -set(kis_base_node_test_SRCS kis_base_node_test.cpp ) -kde4_add_unit_test(KisBaseNodeTest TESTNAME krita-image-BaseNodeTest ${kis_base_node_test_SRCS}) -target_link_libraries(KisBaseNodeTest kritaimage Qt5::Test) +# kisdoc dep +# kis_transform_worker_test.cpp +# TEST_NAME krita-image-KisTransformWorkerTest +#LINK_LIBRARIES kritaimage Qt5::Test) -########### next target ############### -set(kis_fast_math_test_SRCS kis_fast_math_test.cpp ) -kde4_add_unit_test(KisFastMathTest TESTNAME krita-image-FastMathTest ${kis_fast_math_test_SRCS}) -target_link_libraries(KisFastMathTest kritaimage Qt5::Test) +# kisdoc +# kis_perspective_transform_worker_test.cpp +# TEST_NAME krita-image-KisPerspectiveTransformWorkerTest +#LINK_LIBRARIES kritaimage Qt5::Test) -########### next target ############### +# kis_cs_conversion_test.cpp +# TEST_NAME krita-image-KisCsConversionTest +# LINK_LIBRARIES kritaimage Qt5::Test) -set(kis_node_test_SRCS kis_node_test.cpp ) -kde4_add_unit_test(KisNodeTest TESTNAME krita-image-Node-Test ${kis_node_test_SRCS}) -target_link_libraries(KisNodeTest kritaimage Qt5::Test) +# kisdoc +# kis_processings_test.cpp +# TEST_NAME krita-image-KisProcessingsTest +#LINK_LIBRARIES kritaimage Qt5::Test) -########### next target ############### +# image/tests cannot use stuff that needs kisdocument +# kis_projection_leaf_test.cpp +# TEST_NAME kritaimage-projection_leaf_test +# LINK_LIBRARIES kritaimage Qt5::Test) -set(kis_node_facade_test_SRCS kis_node_facade_test.cpp ) -kde4_add_unit_test(KisNodeFacadeTest TESTNAME krita-image-NodeFacadeTest ${kis_node_facade_test_SRCS}) -target_link_libraries(KisNodeFacadeTest kritaimage Qt5::Test) -########### next target ############### if (NOT HAVE_FAILING_CMAKE) - set(kis_paint_device_test_SRCS kis_paint_device_test.cpp ) - kde4_add_broken_unit_test(KisPaintDeviceTest TESTNAME krita-image-KisPaintDeviceTest ${kis_paint_device_test_SRCS}) - target_link_libraries(KisPaintDeviceTest kritaimage kritaodf Qt5::Test) + krita_add_broken_unit_test(kis_paint_device_test.cpp + TEST_NAME krita-image-KisPaintDeviceTest + LINK_LIBRARIES kritaimage kritaodf Qt5::Test) else() message(WARNING "Skipping KisPaintDeviceTest!!!!!!!!!!!!!!") endif() -########### next target ############### - -set(kis_fixed_paint_device_test_SRCS kis_fixed_paint_device_test.cpp ) -kde4_add_unit_test(KisFixedPaintDeviceTest TESTNAME krita-image-KisFixedPaintDeviceTest ${kis_fixed_paint_device_test_SRCS}) -target_link_libraries(KisFixedPaintDeviceTest kritaimage Qt5::Test) - - -########### next target ############### - -set(kis_layer_test_SRCS kis_layer_test.cpp ) -kde4_add_unit_test(KisLayerTest TESTNAME krita-image-KisLayerTest ${kis_layer_test_SRCS}) -target_link_libraries(KisLayerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_effect_mask_test_SRCS kis_effect_mask_test.cpp ) -kde4_add_unit_test(KisEffectMaskTest TESTNAME krita-image-KisEffectMaskTest ${kis_effect_mask_test_SRCS}) -target_link_libraries(KisEffectMaskTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_iterator_test_SRCS kis_iterator_test.cpp ) -kde4_add_unit_test(KisIteratorTest TESTNAME krita-image-KisIteratorTest ${kis_iterator_test_SRCS}) -target_link_libraries(KisIteratorTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_painter_test_SRCS kis_painter_test.cpp ) - - -kde4_add_unit_test(KisPainterTest TESTNAME krita-image-KisPainterTest ${kis_painter_test_SRCS}) - -target_link_libraries(KisPainterTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_selection_test_SRCS kis_selection_test.cpp ) - -kde4_add_unit_test(KisSelectionTest TESTNAME krita-image-SelectionTest ${kis_selection_test_SRCS}) - -target_link_libraries(KisSelectionTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_count_visitor_test_SRCS kis_count_visitor_test.cpp ) - -kde4_add_unit_test(KisCountVisitorTest TESTNAME krita-image-KisCountVisitorTest ${kis_count_visitor_test_SRCS}) - -target_link_libraries(KisCountVisitorTest kritaimage Qt5::Test) - -########### next target ############### -set(kis_projection_test_SRCS kis_projection_test.cpp ) - -kde4_add_unit_test(KisProjectionTest TESTNAME krita-image-KisProjectionTest ${kis_projection_test_SRCS}) - -target_link_libraries(KisProjectionTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_properties_configuration_test_SRCS kis_properties_configuration_test.cpp ) - -kde4_add_unit_test(Kis_Properties_Configuration_Test TESTNAME krita-image-properties-configuration-Test ${kis_properties_configuration_test_SRCS}) - -target_link_libraries(Kis_Properties_Configuration_Test kritaimage Qt5::Test) - -########### next target ############### - -set(kis_transaction_test_SRCS kis_transaction_test.cpp ) - -kde4_add_unit_test(KisTransactionTest TESTNAME krita-image-KisTransactionTest ${kis_transaction_test_SRCS}) - -target_link_libraries(KisTransactionTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_pixel_selection_test_SRCS kis_pixel_selection_test.cpp ) - -kde4_add_unit_test(KisPixelSelectionTest TESTNAME krita-image-KisPixelSelectionTest ${kis_pixel_selection_test_SRCS}) - -target_link_libraries(KisPixelSelectionTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_group_layer_test_SRCS kis_group_layer_test.cpp ) - -kde4_add_unit_test(KisGroupLayerTest TESTNAME krita-image-KisGroupLayerTest ${kis_group_layer_test_SRCS}) - -target_link_libraries(KisGroupLayerTest kritaimage Qt5::Test) - -########### next target ############### - if (NOT HAVE_FAILING_CMAKE) - set(kis_filter_mask_test_SRCS kis_filter_mask_test.cpp ) - kde4_add_broken_unit_test(KisFilterMaskTest TESTNAME krita-image-KisFilterMaskTest ${kis_filter_mask_test_SRCS}) - target_link_libraries(KisFilterMaskTest kritaimage Qt5::Test) + krita_add_broken_unit_test(kis_filter_mask_test.cpp + TEST_NAME krita-image-KisFilterMaskTest + LINK_LIBRARIES kritaimage Qt5::Test) else() message(WARNING "Skipping KisFilterMaskTest!!!!!!!!!!!!!!") endif() -########### next target ############### - -set(kis_transform_mask_test_SRCS kis_transform_mask_test.cpp ) - -kde4_add_broken_unit_test(KisTransformMaskTest TESTNAME krita-image-KisTransformMaskTest ${kis_transform_mask_test_SRCS}) - -target_link_libraries(KisTransformMaskTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_paint_layer_test_SRCS kis_paint_layer_test.cpp ) - -kde4_add_unit_test(KisPaintLayerTest TESTNAME krita-image-KisPaintLayerTest ${kis_paint_layer_test_SRCS}) - -target_link_libraries(KisPaintLayerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_adjustment_layer_test_SRCS kis_adjustment_layer_test.cpp ) -kde4_add_unit_test(KisAdjustmentLayerTest TESTNAME krita-image-KisAdjustmentLayerTest ${kis_adjustment_layer_test_SRCS}) -target_link_libraries(KisAdjustmentLayerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_annotation_test_SRCS kis_annotation_test.cpp ) -kde4_add_unit_test(KisAnnotationTest TESTNAME krita-image-KisAnnotationTest ${kis_annotation_test_SRCS}) -target_link_libraries(KisAnnotationTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_change_profile_visitor_test_SRCS kis_change_profile_visitor_test.cpp ) -kde4_add_unit_test(KisChangeProfileVisitorTest TESTNAME krita-image-KisChangeProfileVisitorTest ${kis_change_profile_visitor_test_SRCS}) -target_link_libraries(KisChangeProfileVisitorTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_clone_layer_test_SRCS kis_clone_layer_test.cpp ) -kde4_add_unit_test(KisCloneLayerTest TESTNAME krita-image-KisCloneLayerTest ${kis_clone_layer_test_SRCS}) -target_link_libraries(KisCloneLayerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_colorspace_convert_visitor_test_SRCS kis_colorspace_convert_visitor_test.cpp ) -kde4_add_unit_test(KisColorspaceConvertVisitorTest TESTNAME krita-image-KisColorspaceConvertVisitorTest ${kis_colorspace_convert_visitor_test_SRCS}) -target_link_libraries(KisColorspaceConvertVisitorTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_convolution_painter_test_SRCS kis_convolution_painter_test.cpp ) -kde4_add_unit_test(KisConvolutionPainterTest TESTNAME krita-image-KisConvolutionPainterTest ${kis_convolution_painter_test_SRCS}) -target_link_libraries(KisConvolutionPainterTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_crop_processing_visitor_test_SRCS kis_crop_processing_visitor_test.cpp ) -kde4_add_unit_test(KisCropProcessingVisitorTest TESTNAME krita-image-KisCropProcessingVisitorTest ${kis_crop_processing_visitor_test_SRCS}) -target_link_libraries(KisCropProcessingVisitorTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_processing_applicator_test_SRCS kis_processing_applicator_test.cpp ) -kde4_add_unit_test(KisProcessingApplicatorTest TESTNAME krita-image-KisProcessingApplicatorTest ${kis_processing_applicator_test_SRCS}) -target_link_libraries(KisProcessingApplicatorTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_datamanager_test_SRCS kis_datamanager_test.cpp ) -kde4_add_unit_test(KisDatamanagerTest TESTNAME krita-image-KisDatamanagerTest ${kis_datamanager_test_SRCS}) -target_link_libraries(KisDatamanagerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_fill_painter_test_SRCS kis_fill_painter_test.cpp ) -kde4_add_unit_test(KisFillPainterTest TESTNAME krita-image-KisFillPainterTest ${kis_fill_painter_test_SRCS}) -target_link_libraries(KisFillPainterTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_filter_configuration_test_SRCS kis_filter_configuration_test.cpp ) -kde4_add_unit_test(KisFilterConfigurationTest TESTNAME krita-image-KisFilterConfigurationTest ${kis_filter_configuration_test_SRCS}) -target_link_libraries(KisFilterConfigurationTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_filter_test_SRCS kis_filter_test.cpp ) -kde4_add_unit_test(KisFilterTest TESTNAME krita-image-KisFilterTest ${kis_filter_test_SRCS}) -target_link_libraries(KisFilterTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_filter_processing_information_test_SRCS kis_filter_processing_information_test.cpp ) -kde4_add_unit_test(KisFilterProcessingInformationTest TESTNAME krita-image-KisFilterProcessingInformationTest ${kis_filter_processing_information_test_SRCS}) -target_link_libraries(KisFilterProcessingInformationTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_filter_registry_test_SRCS kis_filter_registry_test.cpp ) -kde4_add_unit_test(KisFilterRegistryTest TESTNAME krita-image-KisFilterRegistryTest ${kis_filter_registry_test_SRCS}) -target_link_libraries(KisFilterRegistryTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_filter_strategy_test_SRCS kis_filter_strategy_test.cpp ) -kde4_add_unit_test(KisFilterStrategyTest TESTNAME krita-image-KisFilterStrategyTest ${kis_filter_strategy_test_SRCS}) -target_link_libraries(KisFilterStrategyTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_gradient_painter_test_SRCS kis_gradient_painter_test.cpp ) -kde4_add_unit_test(KisGradientPainterTest TESTNAME krita-image-KisGradientPainterTest ${kis_gradient_painter_test_SRCS}) -target_link_libraries(KisGradientPainterTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_histogram_test_SRCS kis_histogram_test.cpp ) -kde4_add_broken_unit_test(KisHistogramTest TESTNAME krita-image-KisHistogramTest ${kis_histogram_test_SRCS}) -target_link_libraries(KisHistogramTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_image_commands_test_SRCS kis_image_commands_test.cpp ) -kde4_add_unit_test(KisImageCommandsTest TESTNAME krita-image-KisImageCommandsTest ${kis_image_commands_test_SRCS}) -target_link_libraries(KisImageCommandsTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_image_test_SRCS kis_image_test.cpp ) -kde4_add_unit_test(KisImageTest TESTNAME krita-image-KisImageTest ${kis_image_test_SRCS}) -target_link_libraries(KisImageTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_image_signal_router_test_SRCS kis_image_signal_router_test.cpp ) -kde4_add_unit_test(KisImageSignalRouterTest TESTNAME krita-image-KisImageSignalRouterTest ${kis_image_signal_router_test_SRCS}) -target_link_libraries(KisImageSignalRouterTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_iterators_ng_test_SRCS kis_iterators_ng_test.cpp ) -kde4_add_unit_test(KisIteratorsNGTest TESTNAME krita-image-KisIteratorsNGTest ${kis_iterators_ng_test_SRCS}) -target_link_libraries(KisIteratorsNGTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_iterator_benchmark_SRCS kis_iterator_benchmark.cpp ) -kde4_add_unit_test(KisIteratorBenchmark TESTNAME krita-image-KisIteratorBenchmark ${kis_iterator_benchmark_SRCS}) -target_link_libraries(KisIteratorBenchmark kritaimage Qt5::Test) - -########### next target ############### - -set(kis_walkers_test_SRCS kis_walkers_test.cpp ) -kde4_add_broken_unit_test(KisWalkersTest TESTNAME krita-image-KisWalkersTest ${kis_walkers_test_SRCS}) -target_link_libraries(KisWalkersTest kritaimage Qt5::Test) - -########### next target ############### - -#set(kis_async_merger_test_SRCS kis_async_merger_test.cpp ) -#kde4_add_broken_unit_test(KisAsyncMergerTest TESTNAME krita-image-KisAsyncMergerTest ${kis_async_merger_test_SRCS}) -#target_link_libraries(KisAsyncMergerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_updater_context_test_SRCS kis_updater_context_test.cpp ) -kde4_add_unit_test(KisUpdaterContextTest TESTNAME krita-image-KisUpdaterContextTest ${kis_updater_context_test_SRCS}) -target_link_libraries(KisUpdaterContextTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_simple_update_queue_test_SRCS kis_simple_update_queue_test.cpp ) -kde4_add_unit_test(KisSimpleUpdateQueueTest TESTNAME krita-image-KisSimpleUpdateQueueTest ${kis_simple_update_queue_test_SRCS}) -target_link_libraries(KisSimpleUpdateQueueTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_update_scheduler_test_SRCS kis_update_scheduler_test.cpp ) -kde4_add_broken_unit_test(KisUpdateSchedulerTest TESTNAME krita-image-KisUpdateSchedulerTest ${kis_update_scheduler_test_SRCS}) -target_link_libraries(KisUpdateSchedulerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_stroke_test_SRCS kis_stroke_test.cpp ) -kde4_add_unit_test(KisStrokeTest TESTNAME krita-image-KisStrokeTest ${kis_stroke_test_SRCS}) -target_link_libraries(KisStrokeTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_simple_stroke_strategy_test_SRCS kis_simple_stroke_strategy_test.cpp ) -kde4_add_unit_test(KisSimpleStrokeStrategyTest TESTNAME krita-image-KisSimpleStrokeStrategyTest ${kis_simple_stroke_strategy_test_SRCS}) -target_link_libraries(KisSimpleStrokeStrategyTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_stroke_strategy_undo_command_based_test_SRCS kis_stroke_strategy_undo_command_based_test.cpp ) -kde4_add_unit_test(KisStrokeStrategyUndoCommandBasedTest TESTNAME krita-image-KisStrokeStrategyUndoCommandBasedTest ${kis_stroke_strategy_undo_command_based_test_SRCS}) -target_link_libraries(KisStrokeStrategyUndoCommandBasedTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_strokes_queue_test_SRCS kis_strokes_queue_test.cpp ) -kde4_add_unit_test(KisStrokesQueueTest TESTNAME krita-image-KisStrokesQueueTest ${kis_strokes_queue_test_SRCS}) -target_link_libraries(KisStrokesQueueTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_queues_progress_updater_test_SRCS kis_queues_progress_updater_test.cpp ) -kde4_add_broken_unit_test(KisQueuesProgressUpdaterTest TESTNAME krita-image-KisQueuesProgressUpdaterTest ${kis_queues_progress_updater_test_SRCS}) -target_link_libraries(KisQueuesProgressUpdaterTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_macro_test_SRCS kis_macro_test.cpp ) -kde4_add_unit_test(KisMacroTest TESTNAME krita-image-KisMacroTest ${kis_macro_test_SRCS}) -target_link_libraries(KisMacroTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_mask_test_SRCS kis_mask_test.cpp ) -kde4_add_unit_test(KisMaskTest TESTNAME krita-image-KisMaskTest ${kis_mask_test_SRCS}) -target_link_libraries(KisMaskTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_math_toolbox_test_SRCS kis_math_toolbox_test.cpp ) -kde4_add_unit_test(KisMathToolboxTest TESTNAME krita-image-KisMathToolboxTest ${kis_math_toolbox_test_SRCS}) -target_link_libraries(KisMathToolboxTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_name_server_test_SRCS kis_name_server_test.cpp ) -kde4_add_unit_test(KisNameServerTest TESTNAME krita-image-KisNameServerTest ${kis_name_server_test_SRCS}) -target_link_libraries(KisNameServerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_node_commands_test_SRCS kis_node_commands_test.cpp ) -kde4_add_unit_test(KisNodeCommandsTest TESTNAME krita-image-KisNodeCommandsTest ${kis_node_commands_test_SRCS}) -target_link_libraries(KisNodeCommandsTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_node_graph_listener_test_SRCS kis_node_graph_listener_test.cpp ) -kde4_add_unit_test(KisNodeGraphListenerTest TESTNAME krita-image-KisNodeGraphListenerTest ${kis_node_graph_listener_test_SRCS}) -target_link_libraries(KisNodeGraphListenerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_node_visitor_test_SRCS kis_node_visitor_test.cpp ) -kde4_add_unit_test(KisNodeVisitorTest TESTNAME krita-image-KisNodeVisitorTest ${kis_node_visitor_test_SRCS}) -target_link_libraries(KisNodeVisitorTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_paint_information_test_SRCS kis_paint_information_test.cpp ) -kde4_add_unit_test(KisPaintInformationTest TESTNAME krita-image-KisPaintInformationTest ${kis_paint_information_test_SRCS}) -target_link_libraries(KisPaintInformationTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_paintop_test_SRCS kis_paintop_test.cpp ) -kde4_add_unit_test(KisPaintopTest TESTNAME krita-image-KisPaintopTest ${kis_paintop_test_SRCS}) -target_link_libraries(KisPaintopTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_pattern_test_SRCS kis_pattern_test.cpp ) -kde4_add_unit_test(KoPatternTest TESTNAME krita-image-KoPatternTest ${kis_pattern_test_SRCS}) -target_link_libraries(KoPatternTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_recorded_action_factory_registry_test_SRCS kis_recorded_action_factory_registry_test.cpp ) -kde4_add_unit_test(KisRecordedActionFactoryRegistryTest TESTNAME krita-image-KisRecordedActionFactoryRegistryTest ${kis_recorded_action_factory_registry_test_SRCS}) -target_link_libraries(KisRecordedActionFactoryRegistryTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_recorded_action_test_SRCS kis_recorded_action_test.cpp ) -kde4_add_unit_test(KisRecordedActionTest TESTNAME krita-image-KisRecordedActionTest ${kis_recorded_action_test_SRCS}) -target_link_libraries(KisRecordedActionTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_recorded_filter_action_test_SRCS kis_recorded_filter_action_test.cpp ) -kde4_add_unit_test(KisRecordedFilterActionTest TESTNAME krita-image-KisRecordedFilterActionTest ${kis_recorded_filter_action_test_SRCS}) -target_link_libraries(KisRecordedFilterActionTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_selection_mask_test_SRCS kis_selection_mask_test.cpp ) -kde4_add_unit_test(KisSelectionMaskTest TESTNAME krita-image-KisSelectionMaskTest ${kis_selection_mask_test_SRCS}) -target_link_libraries(KisSelectionMaskTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_shared_ptr_test_SRCS kis_shared_ptr_test.cpp ) -kde4_add_unit_test(KisSharedPtrTest TESTNAME krita-image-KisSharedPtrTest ${kis_shared_ptr_test_SRCS}) -target_link_libraries(KisSharedPtrTest kritaimage Qt5::Test) - -########### next target ############### -# kisdoc dep -#set(kis_transform_worker_test_SRCS kis_transform_worker_test.cpp ) -#kde4_add_unit_test(KisTransformWorkerTest TESTNAME krita-image-KisTransformWorkerTest ${kis_transform_worker_test_SRCS}) -#target_link_libraries(KisTransformWorkerTest kritaimage Qt5::Test) - -########### next target ############### -# kisdoc -#set(kis_perspective_transform_worker_test_SRCS kis_perspective_transform_worker_test.cpp ) -#kde4_add_unit_test(KisPerspectiveTransformWorkerTest TESTNAME krita-image-KisPerspectiveTransformWorkerTest ${kis_perspective_transform_worker_test_SRCS}) -#target_link_libraries(KisPerspectiveTransformWorkerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_bsplines_test_SRCS kis_bsplines_test.cpp ) -kde4_add_unit_test(KisBSplinesTest TESTNAME krita-image-KisBSplinesTest ${kis_bsplines_test_SRCS}) -target_link_libraries(KisBSplinesTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_warp_transform_worker_test_SRCS kis_warp_transform_worker_test.cpp) -kde4_add_unit_test(KisWarpTransformWorkerTest TESTNAME krita-image-KisWarpTransformWorkerTest ${kis_warp_transform_worker_test_SRCS}) -target_link_libraries(KisWarpTransformWorkerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_cage_transform_worker_test_SRCS kis_cage_transform_worker_test.cpp) -kde4_add_broken_unit_test(KisCageTransformWorkerTest TESTNAME krita-image-KisCageTransformWorkerTest ${kis_cage_transform_worker_test_SRCS}) -target_link_libraries(KisCageTransformWorkerTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_liquify_transform_worker_test_SRCS kis_liquify_transform_worker_test.cpp) -kde4_add_unit_test(KisLiquifyTransformWorkerTest TESTNAME krita-image-KisLiquifyTransformWorkerTest ${kis_liquify_transform_worker_test_SRCS}) -target_link_libraries(KisLiquifyTransformWorkerTest kritaimage Qt5::Test) - - -########### next target ############### - -set(kis_transparency_mask_test_SRCS kis_transparency_mask_test.cpp ) -kde4_add_unit_test(KisTransparencyMaskTest TESTNAME krita-image-KisTransparencyMaskTest ${kis_transparency_mask_test_SRCS}) -target_link_libraries(KisTransparencyMaskTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_types_test_SRCS kis_types_test.cpp ) -kde4_add_unit_test(KisTypesTest TESTNAME krita-image-KisTypesTest ${kis_types_test_SRCS}) -target_link_libraries(KisTypesTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_vec_test_SRCS kis_vec_test.cpp ) -kde4_add_unit_test(KisVecTest TESTNAME krita-image-KisVecTest ${kis_vec_test_SRCS}) -target_link_libraries(KisVecTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_filter_config_widget_test_SRCS kis_filter_config_widget_test.cpp ) -kde4_add_unit_test(KisFilterConfigWidgetTest TESTNAME krita-image-KisFilterConfigWidgetTest ${kis_filter_config_widget_test_SRCS}) -target_link_libraries(KisFilterConfigWidgetTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_meta_data_test_SRCS kis_meta_data_test.cpp ) -kde4_add_broken_unit_test(KisMetaDataTest TESTNAME krita-image-KisMetaDataTest ${kis_meta_data_test_SRCS}) -target_link_libraries(KisMetaDataTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_random_generator_test_SRCS kis_random_generator_test.cpp ) -kde4_add_broken_unit_test(KisRandomGeneratorTest TESTNAME krita-image-KisRandomGeneratorTest ${kis_random_generator_test_SRCS}) -target_link_libraries(KisRandomGeneratorTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_mask_generator_test_SRCS kis_mask_generator_test.cpp ) -kde4_add_unit_test(KisMaskGeneratorTest TESTNAME krita-image-KisMaskGeneratorTest ${kis_mask_generator_test_SRCS}) -target_link_libraries(KisMaskGeneratorTest kritaimage Qt5::Test) - -########### next target ############### - -#set(kis_cs_conversion_test_SRCS kis_cs_conversion_test.cpp ) -#kde4_add_unit_test(KisCsConversionTest TESTNAME krita-image-KisCsConversionTest ${kis_cs_conversion_test_SRCS}) -#target_link_libraries(KisCsConversionTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_cubic_curve_test_SRCS kis_cubic_curve_test.cpp ) -kde4_add_unit_test(KisCubicCurveTest TESTNAME krita-image-KisCubicCurveTest ${kis_cubic_curve_test_SRCS}) -target_link_libraries(KisCubicCurveTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_node_query_path_test_SRCS kis_node_query_path_test.cpp ) -kde4_add_unit_test(KisNodeQueryPathTest TESTNAME krita-image-KisNodeQueryPathTest ${kis_node_query_path_test_SRCS}) -target_link_libraries(KisNodeQueryPathTest kritaimage Qt5::Test) - -########### next target ############### -# kisdoc -#set(kis_processings_test_SRCS kis_processings_test.cpp ) -#kde4_add_unit_test(KisProcessingsTest TESTNAME krita-image-KisProcessingsTest ${kis_processings_test_SRCS}) -#target_link_libraries(KisProcessingsTest kritaimage Qt5::Test) - - -########### next target ############### - -set(kis_fixed_point_maths_test_SRCS kis_fixed_point_maths_test.cpp ) -kde4_add_unit_test(KisFixedPointMathsTest TESTNAME krita-image-KisFixedPointMathsTest ${kis_fixed_point_maths_test_SRCS}) -target_link_libraries(KisFixedPointMathsTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_filter_weights_buffer_test_SRCS kis_filter_weights_buffer_test.cpp ) -kde4_add_unit_test(KisFilterWeightsBufferTest TESTNAME krita-image-KisFilterWeightsBufferTest ${kis_filter_weights_buffer_test_SRCS}) -target_link_libraries(KisFilterWeightsBufferTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_filter_weights_applicator_test_SRCS kis_filter_weights_applicator_test.cpp ) -kde4_add_unit_test(KisFilterWeightsApplicatorTest TESTNAME krita-image-KisFilterWeightsApplicatorTest ${kis_filter_weights_applicator_test_SRCS}) -target_link_libraries(KisFilterWeightsApplicatorTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_fill_interval_test_SRCS kis_fill_interval_test.cpp ) -kde4_add_unit_test(KisFillIntervalTest TESTNAME krita-image-FillInterval-Test ${kis_fill_interval_test_SRCS}) -target_link_libraries(KisFillIntervalTest kritaimage Qt5::Test) - - -########### next target ############### - -set(kis_fill_interval_map_test_SRCS kis_fill_interval_map_test.cpp ) -kde4_add_unit_test(KisFillIntervalMapTest TESTNAME krita-image-FillIntervalMap-Test ${kis_fill_interval_map_test_SRCS}) -target_link_libraries(KisFillIntervalMapTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_scanline_fill_test_SRCS kis_scanline_fill_test.cpp ) -kde4_add_unit_test(KisScanlineFillTest TESTNAME krita-image-ScanlineFill-Test ${kis_scanline_fill_test_SRCS}) -target_link_libraries(KisScanlineFillTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_keyframing_test_SRCS kis_keyframing_test.cpp ) -kde4_add_broken_unit_test(KisKeyframingTest TESTNAME krita-image-Keyframing-Test ${kis_keyframing_test_SRCS}) -target_link_libraries(KisKeyframingTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_psd_layer_style_test_SRCS kis_psd_layer_style_test.cpp ) -kde4_add_unit_test(KisPSDLayerStyleTest TESTNAME krita-image-PSDLayerStyle-Test ${kis_psd_layer_style_test_SRCS}) -target_link_libraries(KisPSDLayerStyleTest kritaimage Qt5::Test) - -########### next target ############### - -#set(kis_dom_utils_test_SRCS kis_dom_utils_test.cpp ) -#kde4_add_unit_test(KisDomUtilsTest TESTNAME krita-image-DomUtils-Test ${kis_dom_utils_test_SRCS}) -#target_link_libraries(KisDomUtilsTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_image_animation_interface_test_SRCS kis_image_animation_interface_test.cpp ) -kde4_add_broken_unit_test(KisImageAnimationInterfaceTest TESTNAME krita-image-ImageAnimationInterface-Test ${kis_image_animation_interface_test_SRCS}) -target_link_libraries(KisImageAnimationInterfaceTest ${KDE4_KDEUI_LIBS} kritaimage ${QT_QTTEST_LIBRARY}) -########### next target ############### - -set(kis_onion_skin_compositor_test_SRCS kis_onion_skin_compositor_test.cpp ) -kde4_add_broken_unit_test(KisOnionSkinCompositorTest TESTNAME krita-image-OnionSkinCompositor-Test ${kis_onion_skin_compositor_test_SRCS}) -target_link_libraries(KisOnionSkinCompositorTest ${KDE4_KDEUI_LIBS} kritaimage ${QT_QTTEST_LIBRARY}) - -########### next target ############### - -set(kis_layer_styles_test_SRCS kis_layer_styles_test.cpp ) -kde4_add_broken_unit_test(KisLayerStylesTest TESTNAME krita-image-LayerStylesTest ${kis_layer_styles_test_SRCS}) -target_link_libraries(KisLayerStylesTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_layer_style_projection_plane_test_SRCS kis_layer_style_projection_plane_test.cpp ) -kde4_add_unit_test(KisLayerStyleProjectionPlaneTest TESTNAME kritaimage-layer_style_projection_plane_test ${kis_layer_style_projection_plane_test_SRCS}) -target_link_libraries(KisLayerStyleProjectionPlaneTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_layer_style_filter_environment_test_SRCS kis_layer_style_filter_environment_test.cpp ) -kde4_add_unit_test(KisLayerStyleFilterEnvironmentTest TESTNAME kritaimage-layer_style_filter_environment_test ${kis_layer_style_filter_environment_test_SRCS}) -target_link_libraries(KisLayerStyleFilterEnvironmentTest ${KDE4_KDEUI_LIBS} kritaimage ${QT_QTTEST_LIBRARY}) - -########### next target ############### -# image/tests cannot use stuff that needs kisdocument -#set(kis_projection_leaf_test_SRCS kis_projection_leaf_test.cpp ) -#kde4_add_unit_test(KisProjectionLeafTest TESTNAME kritaimage-projection_leaf_test ${kis_projection_leaf_test_SRCS}) -#target_link_libraries(KisProjectionLeafTest kritaimage ${QT_QTTEST_LIBRARY}) +krita_add_broken_unit_test(kis_transform_mask_test.cpp + TEST_NAME krita-image-KisTransformMaskTest + LINK_LIBRARIES kritaimage Qt5::Test) -########### next target ############### +krita_add_broken_unit_test(kis_histogram_test.cpp + TEST_NAME krita-image-KisHistogramTest + LINK_LIBRARIES kritaimage Qt5::Test) -set(kis_lod_capable_layer_offset_test_SRCS kis_lod_capable_layer_offset_test.cpp ) -kde4_add_unit_test(KisLodCapableLayerOffsetTest TESTNAME kritaimage-lod_capable_layer_offset_test ${kis_lod_capable_layer_offset_test_SRCS}) -target_link_libraries(KisLodCapableLayerOffsetTest kritaimage ${QT_QTTEST_LIBRARY}) +krita_add_broken_unit_test(kis_walkers_test.cpp + TEST_NAME krita-image-KisWalkersTest + LINK_LIBRARIES kritaimage Qt5::Test) -########### next target ############### +#krita_add_broken_unit_test(kis_async_merger_test.cpp +# TEST_NAME krita-image-KisAsyncMergerTest +# LINK_LIBRARIES kritaimage Qt5::Test) -set(kis_asl_parser_test_SRCS kis_asl_parser_test.cpp ) -kde4_add_unit_test(KisAslParserTest TESTNAME kritalibpsd-asl_parser_test ${kis_asl_parser_test_SRCS}) -target_link_libraries(KisAslParserTest kritapsd kritapigment kritawidgetutils ${QT_QTXML_LIBRARY} Qt5::Test) +krita_add_broken_unit_test(kis_update_scheduler_test.cpp + TEST_NAME krita-image-KisUpdateSchedulerTest + LINK_LIBRARIES kritaimage Qt5::Test) -########### next target ############### +krita_add_broken_unit_test(kis_queues_progress_updater_test.cpp + TEST_NAME krita-image-KisQueuesProgressUpdaterTest + LINK_LIBRARIES kritaimage Qt5::Test) -set(kis_algebra_2d_test_SRCS kis_algebra_2d_test.cpp ) -kde4_add_unit_test(KisAlgebra2DTest TESTNAME kritaimage-algebra_2d_test ${kis_algebra_2d_test_SRCS}) -target_link_libraries(KisAlgebra2DTest kritaimage ${QT_QTTEST_LIBRARY}) +krita_add_broken_unit_test(kis_cage_transform_worker_test.cpp + TEST_NAME krita-image-KisCageTransformWorkerTest + LINK_LIBRARIES kritaimage Qt5::Test) -########### next target ############### +krita_add_broken_unit_test(kis_meta_data_test.cpp + TEST_NAME krita-image-KisMetaDataTest + LINK_LIBRARIES kritaimage Qt5::Test) -set(kis_marker_painter_test_SRCS kis_marker_painter_test.cpp ) -kde4_add_unit_test(KisMarkerPainterTest TESTNAME kritaimage-marker_painter_test ${kis_marker_painter_test_SRCS}) -target_link_libraries(KisMarkerPainterTest kritaimage ${QT_QTTEST_LIBRARY}) +krita_add_broken_unit_test(kis_random_generator_test.cpp + TEST_NAME krita-image-KisRandomGeneratorTest + LINK_LIBRARIES kritaimage Qt5::Test) -########### next target ############### +krita_add_broken_unit_test(kis_keyframing_test.cpp + TEST_NAME krita-image-Keyframing-Test + LINK_LIBRARIES kritaimage Qt5::Test) -set(kis_lazy_brush_test_SRCS kis_lazy_brush_test.cpp ) -kde4_add_unit_test(KisLazyBrushTest TESTNAME kritaimage-lazy_brush_test ${kis_lazy_brush_test_SRCS}) -target_link_libraries(KisLazyBrushTest kritaimage ${QT_QTTEST_LIBRARY}) +krita_add_broken_unit_test(kis_image_animation_interface_test.cpp + TEST_NAME krita-image-ImageAnimationInterface-Test + LINK_LIBRARIES ${KDE4_KDEUI_LIBS} kritaimage Qt5::Test) -########### next target ############### +krita_add_broken_unit_test(kis_onion_skin_compositor_test.cpp + TEST_NAME krita-image-OnionSkinCompositor-Test + LINK_LIBRARIES ${KDE4_KDEUI_LIBS} kritaimage Qt5::Test) -set(kis_colorize_mask_test_SRCS kis_colorize_mask_test.cpp ) -kde4_add_unit_test(KisColorizeMaskTest TESTNAME kritaimage-colorize_mask_test ${kis_colorize_mask_test_SRCS}) -target_link_libraries(KisColorizeMaskTest kritaimage ${QT_QTTEST_LIBRARY}) +krita_add_broken_unit_test(kis_layer_styles_test.cpp + TEST_NAME krita-image-LayerStylesTest + LINK_LIBRARIES kritaimage Qt5::Test) diff --git a/libs/image/tiles3/tests/CMakeLists.txt b/libs/image/tiles3/tests/CMakeLists.txt index 7c3e4aee61..3d852dec03 100644 --- a/libs/image/tiles3/tests/CMakeLists.txt +++ b/libs/image/tiles3/tests/CMakeLists.txt @@ -1,75 +1,67 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_BINARY_DIR}/libs/image ) include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR} ) macro_add_unittest_definitions() -########### next target ############### -set(kis_tiled_data_manager_test_SRCS kis_tiled_data_manager_test.cpp ) -kde4_add_unit_test(KisTiledDataManagerTest TESTNAME krita-image-KisTiledDataManagerTest ${kis_tiled_data_manager_test_SRCS}) -target_link_libraries(KisTiledDataManagerTest kritaimage Qt5::Test) +ecm_add_tests( + kis_tiled_data_manager_test.cpp + kis_low_memory_tests.cpp + kis_lockless_stack_test.cpp + NAME_PREFIX "krita-image-tiles3-" + LINK_LIBRARIES kritaimage Qt5::Test) -########### next target ############### -set(kis_low_memory_tests_SRCS kis_low_memory_tests.cpp ) -kde4_add_unit_test(KisLowMemoryTests TESTNAME krita-image-KisLowMemoryTests ${kis_low_memory_tests_SRCS}) -target_link_libraries(KisLowMemoryTests kritaimage Qt5::Test) -set_tests_properties(krita-image-KisLowMemoryTests PROPERTIES TIMEOUT 180) +set_tests_properties(krita-image-tiles3-kis_low_memory_tests PROPERTIES TIMEOUT 180) ########### next target ############### #kisdoc #set(kis_tile_compressors_test_SRCS kis_tile_compressors_test.cpp ) -#kde4_add_unit_test(KisTileCompressorsTest TESTNAME krita-image-KisTileCompressorsTest ${kis_tile_compressors_test_SRCS}) -#target_link_libraries(KisTileCompressorsTest kritaodf kritaimage Qt5::Test) +#kde4_add_unit_test(KisTileCompressorsTest TEST_NAME krita-image-KisTileCompressorsTest ${kis_tile_compressors_test_SRCS}) +#target_LINK_LIBRARIES(KisTileCompressorsTest kritaodf kritaimage Qt5::Test) ########### next target ############### #kisdoc #set(kis_compression_tests_SRCS kis_compression_tests.cpp ) -#kde4_add_unit_test(KisCompressionTests TESTNAME krita-image-KisCompressionTests ${kis_compression_tests_SRCS}) -#target_link_libraries(KisCompressionTests kritaimage Qt5::Test) - -########### next target ############### -set(kis_lockless_stack_test_SRCS kis_lockless_stack_test.cpp ) -kde4_add_unit_test(KisLocklessStackTest TESTNAME krita-image-KisLocklessStackTest ${kis_lockless_stack_test_SRCS}) -target_link_libraries(KisLocklessStackTest kritaimage Qt5::Test) +#kde4_add_unit_test(KisCompressionTests TEST_NAME krita-image-KisCompressionTests ${kis_compression_tests_SRCS}) +#target_LINK_LIBRARIES(KisCompressionTests kritaimage Qt5::Test) -########### next target ############### -set(kis_memory_pool_test_SRCS kis_memory_pool_test.cpp ) -kde4_add_unit_test(KisMemoryPoolTest TESTNAME krita-image-KisMemoryPoolTest ${kis_memory_pool_test_SRCS}) -target_link_libraries(KisMemoryPoolTest kritaglobal Qt5::Test) +ecm_add_test( + kis_memory_pool_test.cpp + TEST_NAME krita-image-KisMemoryPoolTest + LINK_LIBRARIES kritaglobal Qt5::Test) -########### next target ############### -set(kis_chunk_allocator_test_SRCS kis_chunk_allocator_test.cpp ../swap/kis_chunk_allocator.cpp) -kde4_add_unit_test(KisChunkAllocatorTest TESTNAME krita-image-KisChunkAllocatorTest ${kis_chunk_allocator_test_SRCS}) -target_link_libraries(KisChunkAllocatorTest kritaglobal Qt5::Test) +ecm_add_test( + kis_chunk_allocator_test.cpp ../swap/kis_chunk_allocator.cpp + TEST_NAME krita-image-KisChunkAllocatorTest + LINK_LIBRARIES kritaglobal Qt5::Test) -########### next target ############### -set(kis_memory_window_test_SRCS kis_memory_window_test.cpp ../swap/kis_memory_window.cpp) -kde4_add_unit_test(KisMemoryWindowTest TESTNAME krita-image-KisMemoryWindowTest ${kis_memory_window_test_SRCS}) -target_link_libraries(KisMemoryWindowTest kritaglobal Qt5::Test) +ecm_add_test( + kis_memory_window_test.cpp ../swap/kis_memory_window.cpp + TEST_NAME krita-image-KisMemoryWindowTest + LINK_LIBRARIES kritaglobal Qt5::Test) ########### next target ############### -set(kis_swapped_data_store_test_SRCS kis_swapped_data_store_test.cpp ../kis_tile_data.cc) -kde4_add_unit_test(KisSwappedDataStoreTest TESTNAME krita-image-KisSwappedDataStoreTest ${kis_swapped_data_store_test_SRCS}) -target_link_libraries(KisSwappedDataStoreTest kritaimage Qt5::Test ${Boost_SYSTEM_LIBRARY}) +krita_add_broken_unit_test(kis_swapped_data_store_test.cpp ../kis_tile_data.cc + TEST_NAME krita-image-KisSwappedDataStoreTest + LINK_LIBRARIES kritaimage Qt5::Test ${Boost_SYSTEM_LIBRARY}) ########### next target ############### -set(kis_tile_data_store_test_SRCS kis_tile_data_store_test.cpp ../kis_tile_data.cc) -kde4_add_broken_unit_test(KisTileDataStoreTest TESTNAME krita-image-KisTileDataStoreTest ${kis_tile_data_store_test_SRCS}) -target_link_libraries(KisTileDataStoreTest kritaimage Qt5::Test ${Boost_SYSTEM_LIBRARY}) +krita_add_broken_unit_test(kis_tile_data_store_test.cpp ../kis_tile_data.cc + TEST_NAME krita-image-KisTileDataStoreTest + LINK_LIBRARIES kritaimage Qt5::Test ${Boost_SYSTEM_LIBRARY}) ########### next target ############### -set(kis_store_limits_test_SRCS kis_store_limits_test.cpp ../kis_tile_data.cc ) -kde4_add_broken_unit_test(KisStoreLimitsTest TESTNAME krita-image-KisStoreLimitsTest ${kis_store_limits_test_SRCS}) -target_link_libraries(KisStoreLimitsTest kritaimage Qt5::Test ${Boost_SYSTEM_LIBRARY}) +krita_add_broken_unit_test(kis_store_limits_test.cpp ../kis_tile_data.cc + TEST_NAME krita-image-KisStoreLimitsTest + LINK_LIBRARIES kritaimage Qt5::Test ${Boost_SYSTEM_LIBRARY}) ########### next target ############### -set(kis_tile_data_pooler_test_SRCS kis_tile_data_pooler_test.cpp ../kis_tile_data.cc ../kis_tile_data_pooler.cc ) -kde4_add_unit_test(KisTileDataPoolerTest TESTNAME krita-image-KisTileDataPoolerTest ${kis_tile_data_pooler_test_SRCS}) -target_link_libraries(KisTileDataPoolerTest kritaimage Qt5::Test ${Boost_SYSTEM_LIBRARY}) - +krita_add_broken_unit_test(kis_tile_data_pooler_test.cpp ../kis_tile_data.cc ../kis_tile_data_pooler.cc + TEST_NAME krita-image-KisTileDataPoolerTest + LINK_LIBRARIES kritaimage Qt5::Test ${Boost_SYSTEM_LIBRARY}) diff --git a/libs/odf/tests/CMakeLists.txt b/libs/odf/tests/CMakeLists.txt index a1ff450b42..2c81799249 100644 --- a/libs/odf/tests/CMakeLists.txt +++ b/libs/odf/tests/CMakeLists.txt @@ -1,71 +1,23 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) -########### next target ############### - -set(TestKoGenStyles_SRCS TestKoGenStyles.cpp ) -kde4_add_unit_test(TestKoGenStyles TESTNAME libs-odf-TestKoGenStyles ${TestKoGenStyles_SRCS}) -target_link_libraries(TestKoGenStyles kritaodf KF5::I18n Qt5::Test) - -########### next target ############### - -set(TestOdfSettings_SRCS TestOdfSettings.cpp ) -kde4_add_unit_test(TestOdfSettings TESTNAME libs-odf-TestOdfSettings ${TestOdfSettings_SRCS}) -target_link_libraries(TestOdfSettings kritaodf KF5::I18n Qt5::Test) - -########### next target ############### - -set(TestKoOdfLoadingContext_SRCS TestKoOdfLoadingContext.cpp ) -kde4_add_unit_test(TestKoOdfLoadingContext TESTNAME libs-odf-TestKoOdfLoadingContext ${TestKoOdfLoadingContext_SRCS}) -target_link_libraries(TestKoOdfLoadingContext kritaodf KF5::I18n Qt5::Test) - -########### next target ############### - -set(xmlwritertest_SRCS TestXmlWriter.cpp ) - -kde4_add_unit_test(TestXmlWriter TESTNAME libs-odf-TestXmlWriter ${xmlwritertest_SRCS}) - -target_link_libraries(TestXmlWriter kritaodf Qt5::Test) - -########### next target ############### - -set(xmlreadertest_SRCS TestXmlReader.cpp ) -kde4_add_unit_test(TestXmlReader TESTNAME libs-odf-TestXmlReader ${xmlreadertest_SRCS}) -target_link_libraries(TestXmlReader kritaodf Qt5::Test) - -########### next target ############### - -set(xmlreadertestwithoutspaces_SRCS TestXmlReaderWithoutSpaces.cpp ) -kde4_add_unit_test(TestXmlReaderWithoutSpaces TESTNAME libs-odf-TestXmlReaderWithoutSpaces ${xmlreadertestwithoutspaces_SRCS}) -target_link_libraries(TestXmlReaderWithoutSpaces kritaodf Qt5::Test) - -########### next target ############### - -set(kodomtest_SRCS kodomtest.cpp ) -kde4_add_unit_test(kodomtest TESTNAME libs-store-kodomtest ${kodomtest_SRCS}) -target_link_libraries(kodomtest kritaodf Qt5::Test ) - -########### next target ############### - -set(storageTest_SRCS TestStorage.cpp ) -kde4_add_unit_test(TestStorage TESTNAME libs-store-storage ${storageTest_SRCS}) -target_link_libraries(TestStorage kritaodf KF5::I18n Qt5::Test) - -########### next target ############### - -set(TestKoUnit_SRCS TestKoUnit.cpp) -kde4_add_unit_test(TestKoUnit TESTNAME libs-kritaodf-TestKoUnit ${TestKoUnit_SRCS}) -target_link_libraries(TestKoUnit kritaodf Qt5::Test) - -########### next target ############### - -set(TestNumberStyle_SRCS TestNumberStyle.cpp ) -kde4_add_broken_unit_test(TestNumberStyle TESTNAME libs-odf-TestNumberStyle ${TestNumberStyle_SRCS}) -target_link_libraries(TestNumberStyle kritaodf Qt5::Test) - -########### next target ############### - -set(TestKoElementReference_SRCS TestKoElementReference.cpp) -kde4_add_unit_test(TestKoElementReference TESTNAME libs-kritaodf-TestKoElementReference ${TestKoElementReference_SRCS}) -target_link_libraries(TestKoElementReference kritaodf Qt5::Test) - -########### end ############### +include(ECMAddTests) +include(KritaAddBrokenUnitTest) + +ecm_add_tests( + TestKoGenStyles.cpp + TestOdfSettings.cpp + TestKoOdfLoadingContext.cpp + TestStorage.cpp + NAME_PREFIX "libs-odf-" + LINK_LIBRARIES kritaodf KF5::I18n Qt5::Test) + +ecm_add_tests( + TestXmlWriter.cpp + TestXmlReader.cpp + TestXmlReaderWithoutSpaces.cpp + kodomtest.cpp + TestKoUnit.cpp + TestNumberStyle.cpp + TestKoElementReference.cpp + NAME_PREFIX "libs-odf-" + LINK_LIBRARIES kritaodf Qt5::Test) diff --git a/libs/pigment/tests/CMakeLists.txt b/libs/pigment/tests/CMakeLists.txt index cdae2eea5b..910e13e091 100644 --- a/libs/pigment/tests/CMakeLists.txt +++ b/libs/pigment/tests/CMakeLists.txt @@ -1,111 +1,38 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/") include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../colorspaces ) if(MSVC OR (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) # avoid "cannot open file 'LIBC.lib'" error set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBC.LIB") endif() -########### next target ############### +ecm_add_tests( + TestKoColorSpaceRegistry.cpp + TestKoColorSpaceAbstract.cpp + TestColorConversionSystem.cpp + TestKoColor.cpp + TestKoIntegerMaths.cpp + TestConvolutionOpImpl.cpp + KoRgbU8ColorSpaceTester.cpp + TestKoColorSpaceSanity.cpp + TestFallBackColorTransformation.cpp + TestKoChannelInfo.cpp -set(TestKoColorSpaceRegistry_test_SRCS TestKoColorSpaceRegistry.cpp ) + NAME_PREFIX "libs-pigment-" + LINK_LIBRARIES kritapigment KF5::I18n Qt5::Test) -kde4_add_unit_test(TestKoColorSpaceRegistry TESTNAME libs-pigment-TestKoColorSpaceRegistry ${TestKoColorSpaceRegistry_test_SRCS}) +ecm_add_tests( + TestColorConversion.cpp + TestKoColorSpaceMaths.cpp -target_link_libraries(TestKoColorSpaceRegistry kritapigment KF5::I18n Qt5::Test) + NAME_PREFIX "libs-pigment-" + LINK_LIBRARIES kritapigment Qt5::Test) -########### next target ############### -set(TestColorConversion_test_SRCS TestColorConversion.cpp ) -kde4_add_unit_test(TestColorConversion TESTNAME libs-pigment-TestColorConversion ${TestColorConversion_test_SRCS}) - -target_link_libraries(TestColorConversion kritapigment Qt5::Test) - -########### next target ############### - -set(TestKoColorSpaceAbstract_test_SRCS TestKoColorSpaceAbstract.cpp ) - -kde4_add_unit_test(TestKoColorSpaceAbstract TESTNAME libs-pigment-TestKoColorSpaceAbstract ${TestKoColorSpaceAbstract_test_SRCS}) - -target_link_libraries(TestKoColorSpaceAbstract kritapigment KF5::I18n Qt5::Test) - -########### next target ############### - -set(TestKoColorSpaceMaths_test_SRCS TestKoColorSpaceMaths.cpp) - -kde4_add_unit_test(TestKoColorSpaceMaths TESTNAME libs-pigment-TestKoColorSpaceMaths ${TestKoColorSpaceMaths_test_SRCS}) - -target_link_libraries(TestKoColorSpaceMaths kritapigment Qt5::Test) - -########### next target ############### -set(CCSGraph_GRAPH CCSGraph.cpp) -kde4_add_executable(CCSGraph ${CCSGraph_GRAPH}) -target_link_libraries(CCSGraph kritapigment KF5::I18n ) - -########### next target ############### - -set(TestColorConversionSystem_test_SRCS TestColorConversionSystem.cpp ) - -kde4_add_unit_test(TestColorConversionSystem TESTNAME libs-pigment-TestColorConversionSystem ${TestColorConversionSystem_test_SRCS}) - -target_link_libraries(TestColorConversionSystem kritapigment KF5::I18n Qt5::Test) - -########### next target ############### - -set(TestKoColor_test_SRCS TestKoColor.cpp ) - -kde4_add_unit_test(TestKoColor TESTNAME libs-pigment-TestKoColor ${TestKoColor_test_SRCS}) - -target_link_libraries(TestKoColor kritapigment KF5::I18n Qt5::Test) - - -########### next target ############### - -set(TestKoIntegerMaths_test_SRCS TestKoIntegerMaths.cpp ) -kde4_add_unit_test(TestKoIntegerMaths TESTNAME libs-pigment-TestKoIntegerMaths ${TestKoIntegerMaths_test_SRCS}) -target_link_libraries(TestKoIntegerMaths kritapigment KF5::I18n Qt5::Test) - -########### next target ############### - -set(TestConvolutionOpImpl_test_SRCS TestConvolutionOpImpl.cpp ) - -kde4_add_unit_test(TestConvolutionOpImpl TESTNAME libs-pigment-TestConvolutionOpImpl ${TestConvolutionOpImpl_test_SRCS}) - -target_link_libraries(TestConvolutionOpImpl kritapigment KF5::I18n Qt5::Test) - - -########### next target ############### - -set(TestKoRgbU8ColorSpaceTester_test_SRCS KoRgbU8ColorSpaceTester.cpp ) - -kde4_add_unit_test(TestKoRgbU8ColorSpaceTester TESTNAME libs-pigment-TestKoRgbU8ColorSpaceTester ${TestKoRgbU8ColorSpaceTester_test_SRCS}) - -target_link_libraries(TestKoRgbU8ColorSpaceTester kritapigment KF5::I18n Qt5::Test) - -########### next target ############### - -set(TestKoColorSpaceSanity_test_SRCS TestKoColorSpaceSanity.cpp ) - -kde4_add_unit_test(TestKoColorSpaceSanity TESTNAME libs-pigment-TestKoColorSpaceSanity ${TestKoColorSpaceSanity_test_SRCS}) - -target_link_libraries(TestKoColorSpaceSanity kritapigment KF5::I18n Qt5::Test) - -########### next target ############### - -set(TestFallBackColorTransformation_test_SRCS TestFallBackColorTransformation.cpp ) - -kde4_add_unit_test(TestFallBackColorTransformation TESTNAME libs-pigment-TestFallBackColorTransformation ${TestFallBackColorTransformation_test_SRCS}) - -target_link_libraries(TestFallBackColorTransformation kritapigment KF5::I18n Qt5::Test) - -########### next target ############### - -set(TestKoChannelInfo_test_SRCS TestKoChannelInfo.cpp ) - -kde4_add_unit_test(TestKoChannelInfo TESTNAME libs-pigment-TestKoChannelInfo ${TestKoChannelInfo_test_SRCS}) - -target_link_libraries(TestKoChannelInfo kritapigment KF5::I18n Qt5::Test) +add_executable(CCSGraph CCSGraph.cpp) +target_link_libraries(CCSGraph kritapigment KF5::I18n) +ecm_mark_as_test(CCSGraph) diff --git a/libs/store/tests/CMakeLists.txt b/libs/store/tests/CMakeLists.txt index 6463f7f245..c2a00e7d0f 100644 --- a/libs/store/tests/CMakeLists.txt +++ b/libs/store/tests/CMakeLists.txt @@ -1,21 +1,19 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) -########### next target ############### +include(ECMAddTests) -set(lzftest_SRCS ../KoLZF.cpp TestKoLZF.cpp ) -kde4_add_unit_test(TestKoLZF TESTNAME libs-odf-TestKoLZF ${lzftest_SRCS}) -target_link_libraries(TestKoLZF kritastore Qt5::Test) +ecm_add_test( + ../KoLZF.cpp TestKoLZF.cpp + TEST_NAME libs-odf-TestKoLZF + LINK_LIBRARIES kritastore Qt5::Test) -########### next target ############### +ecm_add_test( + ../KoLZF.cpp TestKoXmlVector.cpp + TEST_NAME libs-odf-TestKoXmlVector + LINK_LIBRARIES kritastore Qt5::Test) -set(xmlvectortest_SRCS ../KoLZF.cpp TestKoXmlVector.cpp ) -kde4_add_unit_test(TestKoXmlVector TESTNAME libs-odf-TestKoXmlVector ${xmlvectortest_SRCS}) -target_link_libraries(TestKoXmlVector kritastore Qt5::Test) +########### manual test for file contents ############### -########### next target ############### - -set(storedroptest_SRCS storedroptest.cpp ) -kde4_add_executable(storedroptest TEST ${storedroptest_SRCS}) +add_executable(storedroptest storedroptest.cpp) target_link_libraries(storedroptest kritastore Qt5::Widgets) - - +ecm_mark_as_test(storedroptest) diff --git a/libs/ui/tests/CMakeLists.txt b/libs/ui/tests/CMakeLists.txt index 44d6c9549e..9755ebe95b 100644 --- a/libs/ui/tests/CMakeLists.txt +++ b/libs/ui/tests/CMakeLists.txt @@ -1,274 +1,186 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) #add_subdirectory(scratchpad) include_directories(${CMAKE_SOURCE_DIR}/libs/image/metadata ${CMAKE_SOURCE_DIR}/sdk/tests ) +include(ECMAddTests) macro_add_unittest_definitions() -########### next target ############### - -set(kis_node_model_test_SRCS kis_node_model_test.cpp modeltest.cpp ) -kde4_add_broken_unit_test(kis_node_model_test TESTNAME krita-ui-kis_node_model_test ${kis_node_model_test_SRCS}) -target_link_libraries(kis_node_model_test kritaui Qt5::Test) - -########### next target ############### - -set(kis_image_view_converter_test_SRCS kis_image_view_converter_test.cpp ) -kde4_add_unit_test(KisImageViewConverterTest TESTNAME krita-ui-KisImageViewConverterTest ${kis_image_view_converter_test_SRCS}) -target_link_libraries(KisImageViewConverterTest kritaui Qt5::Test) - -########### next target ############### - -set(kis_shape_controller_test_SRCS kis_shape_controller_test.cpp kis_dummies_facade_base_test.cpp) -kde4_add_broken_unit_test(kis_shape_controller_test TESTNAME krita-ui-kis_shape_controller_test ${kis_shape_controller_test_SRCS}) -target_link_libraries(kis_shape_controller_test kritaimage kritaui Qt5::Test) - -########### next target ############### - -set(squeezedcombobox_test_SRCS squeezedcombobox_test.cpp ) -kde4_add_unit_test(squeezedcombobox_test TESTNAME krita-ui-squeezedcombobox_test ${squeezedcombobox_test_SRCS}) -target_link_libraries(squeezedcombobox_test kritaui Qt5::Test) - -########### next target ############### - -set(kis_prescaled_projection_test_SRCS kis_prescaled_projection_test.cpp ) -kde4_add_broken_unit_test(KisPrescaledProjectionTest TESTNAME krita-ui-kis_prescaled_projection_test ${kis_prescaled_projection_test_SRCS}) -target_link_libraries(KisPrescaledProjectionTest kritaui Qt5::Test) - -########### next target ############### - -set(kis_kra_loader_test_SRCS kis_kra_loader_test.cpp ) -kde4_add_broken_unit_test(KisKraLoaderTest TESTNAME krita-ui-KisKraLoaderTest ${kis_kra_loader_test_SRCS}) -target_link_libraries(KisKraLoaderTest kritaimage kritaui Qt5::Test) - -########### next target ############### - -set(kis_kra_saver_test_SRCS kis_kra_saver_test.cpp ) -kde4_add_broken_unit_test(KisKraSaverTest TESTNAME krita-ui-KisKraSaverTest ${kis_kra_saver_test_SRCS}) -target_link_libraries(KisKraSaverTest kritaimage kritaui Qt5::Test) - - -########### next target ############### - -set(kis_kra_savexml_visitor_test_SRCS kis_kra_savexml_visitor_test.cpp ) -kde4_add_unit_test(KisKraSaveXmlVisitorTest TESTNAME krita-ui-KisKraSaveXmlVisitorTest ${kis_kra_savexml_visitor_test_SRCS}) -target_link_libraries(KisKraSaveXmlVisitorTest kritaimage kritaui Qt5::Test) - -########### next target ############### - -set(kis_shape_selection_test_SRCS kis_shape_selection_test.cpp ) - -kde4_add_unit_test(KisShapeSelectionTest TESTNAME krita-ui-ShapeSelectionTest ${kis_shape_selection_test_SRCS}) - -target_link_libraries(KisShapeSelectionTest kritaimage kritaui Qt5::Test) - -########### next target ############### - -set(kis_exiv2_test_SRCS kis_exiv2_test.cpp ) -kde4_add_broken_unit_test(KisExiv2Test TESTNAME krita-ui-KisExiv2Test ${kis_exiv2_test_SRCS}) -target_link_libraries(KisExiv2Test kritaimage kritaui Qt5::Test) - -########### next target ############### - -set(kis_recorded_action_editor_test_SRCS kis_recorded_action_editor_test.cpp ) -kde4_add_unit_test(KisRecordedActionEditorTest TESTNAME krita-ui-KisRecordedActionEditor ${kis_recorded_action_editor_test_SRCS}) -target_link_libraries(KisRecordedActionEditorTest kritaimage kritaui Qt5::Test) - -########### next target ############### - -set(kis_doc2_test_SRCS kis_doc2_test.cpp ) -kde4_add_unit_test(KisDoc2Test TESTNAME krita-ui-KisDoc2Test ${kis_doc2_test_SRCS}) -target_link_libraries(KisDoc2Test kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_coordinates_converter_test_SRCS kis_coordinates_converter_test.cpp ) -kde4_add_unit_test(KisCoordinatesConverterTest TESTNAME krita-ui-KisCoordinatesConverterTest ${kis_coordinates_converter_test_SRCS}) -target_link_libraries(KisCoordinatesConverterTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_clipboard_test_SRCS kis_clipboard_test.cpp ) -kde4_add_broken_unit_test(KisClipboardTest TESTNAME krita-ui-KisClipboardTest ${kis_clipboard_test_SRCS}) -target_link_libraries(KisClipboardTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(freehand_stroke_test_SRCS freehand_stroke_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp) -kde4_add_broken_unit_test(FreehandStrokeTest TESTNAME krita-ui-FreehandStrokeTest ${freehand_stroke_test_SRCS}) -target_link_libraries(FreehandStrokeTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(fill_processing_visitor_test_SRCS fill_processing_visitor_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp) -kde4_add_broken_unit_test(FillProcessingVisitorTest TESTNAME krita-ui-FillProcessingVisitorTest ${fill_processing_visitor_test_SRCS}) -target_link_libraries(FillProcessingVisitorTest kritaui kritaimage Qt5::Test) - - -########### next target ############### - -set(filter_stroke_test_SRCS filter_stroke_test.cpp ../../../sdk/tests/stroke_testing_utils.cpp) -kde4_add_broken_unit_test(FilterStrokeTest TESTNAME krita-ui-FilterStrokeTest ${filter_stroke_test_SRCS}) -target_link_libraries(FilterStrokeTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_selection_manager_test_SRCS kis_selection_manager_test.cpp) -kde4_add_broken_unit_test(KisSelectionManagerTest TESTNAME krita-ui-KisSelectionManagerTest ${kis_selection_manager_test_SRCS}) -target_link_libraries(KisSelectionManagerTest kritaui kritaimage Qt5::Test) -#set_tests_properties(krita-ui-KisSelectionManagerTest PROPERTIES TIMEOUT 300) - -########### next target ############### - -set(kis_selection_decoration_test_SRCS kis_selection_decoration_test.cpp ../../../sdk/tests/stroke_testing_utils.cpp) -kde4_add_unit_test(KisSelectionDecorationTest TESTNAME krita-ui-KisSelectionDecorationTest ${kis_selection_decoration_test_SRCS}) -target_link_libraries(KisSelectionDecorationTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_node_manager_test_SRCS kis_node_manager_test.cpp) -kde4_add_broken_unit_test(KisNodeManagerTest TESTNAME krita-ui-KisNodeManagerTest ${kis_node_manager_test_SRCS}) -target_link_libraries(KisNodeManagerTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_node_dummies_graph_test_SRCS kis_node_dummies_graph_test.cpp ../../../sdk/tests/testutil.cpp) -kde4_add_unit_test(KisNodeDummiesGraphTest TESTNAME krita-ui-KisNodeDummiesGraphTest ${kis_node_dummies_graph_test_SRCS}) -target_link_libraries(KisNodeDummiesGraphTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_node_shapes_graph_test_SRCS kis_node_shapes_graph_test.cpp ../../../sdk/tests/testutil.cpp) -kde4_add_unit_test(KisNodeShapesGraphTest TESTNAME krita-ui-KisNodeShapesGraphTest ${kis_node_shapes_graph_test_SRCS}) -target_link_libraries(KisNodeShapesGraphTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_dummies_facade_test_SRCS kis_dummies_facade_test.cpp kis_dummies_facade_base_test.cpp ../../../sdk/tests/testutil.cpp) -kde4_add_broken_unit_test(KisDummiesFacadeTest TESTNAME krita-ui-KisDummiesFacadeTest ${kis_dummies_facade_test_SRCS}) -target_link_libraries(KisDummiesFacadeTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_model_index_converter_test_SRCS kis_model_index_converter_test.cpp ../../../sdk/tests/testutil.cpp) -kde4_add_unit_test(KisModelIndexConverterTest TESTNAME krita-ui-KisModelIndexConverterTest ${kis_model_index_converter_test_SRCS}) -target_link_libraries(KisModelIndexConverterTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_zoom_and_pan_test_SRCS kis_zoom_and_pan_test.cpp ../../../sdk/tests/testutil.cpp) -kde4_add_broken_unit_test(KisZoomAndPanTest TESTNAME krita-ui-KisZoomAndPanTest ${kis_zoom_and_pan_test_SRCS}) -target_link_libraries(KisZoomAndPanTest kritaui kritaimage Qt5::Test) -#set_tests_properties(krita-ui-KisZoomAndPanTest PROPERTIES TIMEOUT 300) - -########### next target ############### - -# set(kis_input_manager_test_SRCS kis_input_manager_test.cpp ../../sdk/tests/testutil.cpp) -# kde4_add_unit_test(KisInputManagerTest TESTNAME krita-ui-KisInputManagerTest ${kis_input_manager_test_SRCS}) -# target_link_libraries(KisInputManagerTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_action_manager_test_SRCS kis_action_manager_test.cpp ) -kde4_add_broken_unit_test(KisActionManagerTest TESTNAME krita-ui-KisActionManagerTest ${kis_action_manager_test_SRCS}) -target_link_libraries(KisActionManagerTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_categories_mapper_test_SRCS kis_categories_mapper_test.cpp testing_categories_mapper.cpp) -kde4_add_broken_unit_test(KisCategoriesMapperTest TESTNAME krita-ui-KisCategoriesMapperTest ${kis_categories_mapper_test_SRCS}) -target_link_libraries(KisCategoriesMapperTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_categorized_list_model_test_SRCS kis_categorized_list_model_test.cpp modeltest.cpp) -kde4_add_unit_test(KisCategorizedListModelTest TESTNAME krita-ui-KisCategorizedListModelTest ${kis_categorized_list_model_test_SRCS}) -target_link_libraries(KisCategorizedListModelTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_resource_server_provider_test_SRCS kis_resource_server_provider_test.cpp modeltest.cpp) -kde4_add_unit_test(KisResourceServerProviderTest TESTNAME krita-ui-KisResourceServerProviderTest ${kis_resource_server_provider_test_SRCS}) -target_link_libraries(KisResourceServerProviderTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_file_layer_test_SRCS kis_file_layer_test.cpp ) -kde4_add_unit_test(KisFileLayerTest TESTNAME krita-ui-KisFileLayerTest ${kis_file_layer_test_SRCS}) -target_link_libraries(KisFileLayerTest kritaui kritaimage Qt5::Test) - -########### next target ############### - -set(kis_asl_layer_style_serializer_test_SRCS kis_asl_layer_style_serializer_test.cpp ) -kde4_add_broken_unit_test(KisAslLayerStyleSerializerTest TESTNAME krita-ui-KisAslLayerStyleSerializerTest ${kis_asl_layer_style_serializer_test_SRCS}) -target_link_libraries(KisAslLayerStyleSerializerTest kritaui kritaimage ${QT_QTTEST_LIBRARY}) - -########### next target ############### - -set(kis_node_juggler_compressed_test_SRCS kis_node_juggler_compressed_test.cpp ../../../sdk/tests/testutil.cpp) -kde4_add_unit_test(KisNodeJugglerCompressedTest TESTNAME krita-image-BaseNodeTest ${kis_node_juggler_compressed_test_SRCS}) -target_link_libraries(KisNodeJugglerCompressedTest kritaimage kritaui Qt5::Test) - -########### next target ############### +ecm_add_tests( + kis_image_view_converter_test.cpp + squeezedcombobox_test.cpp + kis_kra_savexml_visitor_test.cpp + kis_shape_selection_test.cpp + kis_recorded_action_editor_test.cpp + kis_doc2_test.cpp + kis_coordinates_converter_test.cpp + kis_grid_config_test.cpp + kis_stabilized_events_sampler_test.cpp + kis_derived_resources_test.cpp + kis_brush_hud_properties_config_test.cpp + NAME_PREFIX "krita-ui-" + LINK_LIBRARIES kritaui Qt5::Test +) + +ecm_add_tests( + kis_file_layer_test.cpp + kis_multinode_property_test.cpp + NAME_PREFIX "krita-ui-" + LINK_LIBRARIES kritaui kritaimage Qt5::Test +) + + +ecm_add_test( kis_selection_decoration_test.cpp ../../../sdk/tests/stroke_testing_utils.cpp + TEST_NAME krita-ui-KisSelectionDecorationTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +ecm_add_test( kis_node_dummies_graph_test.cpp ../../../sdk/tests/testutil.cpp + TEST_NAME krita-ui-KisNodeDummiesGraphTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +ecm_add_test( kis_node_shapes_graph_test.cpp ../../../sdk/tests/testutil.cpp + TEST_NAME krita-ui-KisNodeShapesGraphTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +ecm_add_test( kis_model_index_converter_test.cpp ../../../sdk/tests/testutil.cpp + TEST_NAME krita-ui-KisModelIndexConverterTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +ecm_add_test( kis_categorized_list_model_test.cpp modeltest.cpp + TEST_NAME krita-ui-KisCategorizedListModelTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +ecm_add_test( kis_resource_server_provider_test.cpp modeltest.cpp + TEST_NAME krita-ui-KisResourceServerProviderTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +ecm_add_test( kis_node_juggler_compressed_test.cpp ../../../sdk/tests/testutil.cpp + TEST_NAME krita-image-BaseNodeTest + LINK_LIBRARIES kritaimage kritaui Qt5::Test) set(kis_node_view_test_SRCS kis_node_view_test.cpp ../../../sdk/tests/testutil.cpp) qt5_add_resources(kis_node_view_test_SRCS ${krita_QRCS}) -kde4_add_unit_test(KisNodeViewTest TESTNAME krita-image-BaseNodeTest ${kis_node_view_test_SRCS}) -target_link_libraries(KisNodeViewTest kritaimage kritaui Qt5::Test) - -########### next target ############### - -set(kis_multinode_property_test_SRCS kis_multinode_property_test.cpp) -kde4_add_unit_test(KisMultinodePropertyTest TESTNAME krita-image-BaseNodeTest ${kis_multinode_property_test_SRCS}) -target_link_libraries(KisMultinodePropertyTest kritaimage kritaui Qt5::Test) - -########### next target ############### - -set(kis_grid_config_test_SRCS kis_grid_config_test.cpp) -kde4_add_unit_test(KisGridConfigTest TESTNAME krita-image-BaseNodeTest ${kis_grid_config_test_SRCS}) -target_link_libraries(KisGridConfigTest kritaui Qt5::Test) - -########### next target ############### - -set(kis_animation_exporter_test_SRCS kis_animation_exporter_test.cpp ) -kde4_add_broken_unit_test(KisAnimationExporterTest TESTNAME kritaui-animation_exporter_test ${kis_animation_exporter_test_SRCS}) -target_link_libraries(KisAnimationExporterTest kritaui kritaimage ${QT_QTTEST_LIBRARY}) - -########### next target ############### - -set(kis_animation_importer_test_SRCS kis_animation_importer_test.cpp ) -kde4_add_broken_unit_test(KisAnimationImporterTest TESTNAME kritaui-animation_importer_test ${kis_animation_importer_test_SRCS}) -target_link_libraries(KisAnimationImporterTest kritaui kritaimage ${QT_QTTEST_LIBRARY}) - -########### next target ############### - -set(kis_animation_frame_cache_test_SRCS kis_animation_frame_cache_test.cpp ) -kde4_add_broken_unit_test(KisAnimationFrameCacheTest TESTNAME kritaui-animation_frame_cache_test ${kis_animation_frame_cache_test_SRCS}) -target_link_libraries(KisAnimationFrameCacheTest kritaui kritaimage ${QT_QTTEST_LIBRARY}) - -########### next target ############### - -set(ResourceBundleTest_SRCS ResourceBundleTest.cpp) -kde4_add_broken_unit_test(ResourceBundleTest TESTNAME krita-resourcemanager-ResourceBundleTest ${ResourceBundleTest_SRCS}) -target_link_libraries(ResourceBundleTest kritaui kritalibbrush kritalibpaintop Qt5::Test ) - -########### next target ############### - -set(kis_stabilized_events_sampler_test_SRCS kis_stabilized_events_sampler_test.cpp) -kde4_add_unit_test(KisStabilizedEventsSamplerTest TESTNAME krita-ui-StabilizedEventsSamplerTest ${kis_stabilized_events_sampler_test_SRCS}) -target_link_libraries(KisStabilizedEventsSamplerTest kritaui Qt5::Test) - -########### next target ############### +ecm_add_test(${kis_node_view_test_SRCS} + TEST_NAME krita-image-kis_node_view_test + LINK_LIBRARIES kritaimage kritaui Qt5::Test) + + + +##### Tests that currently fail and should be fixed ##### + +include(KritaAddBrokenUnitTest) + +krita_add_broken_unit_test( + kis_node_model_test.cpp modeltest.cpp + TEST_NAME krita-ui-kis_node_model_test + LINK_LIBRARIES kritaui Qt5::Test) + +krita_add_broken_unit_test( + kis_shape_controller_test.cpp kis_dummies_facade_base_test.cpp + TEST_NAME krita-ui-kis_shape_controller_test + LINK_LIBRARIES kritaimage kritaui Qt5::Test) + +krita_add_broken_unit_test( + kis_prescaled_projection_test.cpp + TEST_NAME krita-ui-kis_prescaled_projection_test + LINK_LIBRARIES kritaui Qt5::Test) + +krita_add_broken_unit_test( + kis_kra_loader_test.cpp + TEST_NAME krita-ui-KisKraLoaderTest + LINK_LIBRARIES kritaimage kritaui Qt5::Test) + +krita_add_broken_unit_test( + kis_kra_saver_test.cpp + TEST_NAME krita-ui-KisKraSaverTest + LINK_LIBRARIES kritaimage kritaui Qt5::Test) + +krita_add_broken_unit_test( + kis_exiv2_test.cpp + TEST_NAME krita-ui-KisExiv2Test + LINK_LIBRARIES kritaimage kritaui Qt5::Test) + +krita_add_broken_unit_test( + kis_clipboard_test.cpp + TEST_NAME krita-ui-KisClipboardTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +krita_add_broken_unit_test( + freehand_stroke_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp + TEST_NAME krita-ui-FreehandStrokeTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +krita_add_broken_unit_test( + fill_processing_visitor_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp + TEST_NAME krita-ui-FillProcessingVisitorTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +krita_add_broken_unit_test( + filter_stroke_test.cpp ../../../sdk/tests/stroke_testing_utils.cpp + TEST_NAME krita-ui-FilterStrokeTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +krita_add_broken_unit_test( + kis_selection_manager_test.cpp + TEST_NAME krita-ui-KisSelectionManagerTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) +#set_tests_properties(krita-ui-KisSelectionManagerTest PROPERTIES TIMEOUT 300) -set(kis_derived_resources_test_SRCS kis_derived_resources_test.cpp) -kde4_add_unit_test(KisDerivedResourcesTest TESTNAME krita-ui-DerivedResourcesTest ${kis_derived_resources_test_SRCS}) -target_link_libraries(KisDerivedResourcesTest kritaui Qt5::Test) +krita_add_broken_unit_test( + kis_node_manager_test.cpp + TEST_NAME krita-ui-KisNodeManagerTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) -########### next target ############### +krita_add_broken_unit_test( + kis_dummies_facade_test.cpp kis_dummies_facade_base_test.cpp ../../../sdk/tests/testutil.cpp + TEST_NAME krita-ui-KisDummiesFacadeTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) -set(kis_brush_hud_properties_config_test_SRCS kis_brush_hud_properties_config_test.cpp) -kde4_add_unit_test(KisBrushHudPropertiesConfigTest TESTNAME krita-ui-BrushHudPropertiesConfigTest ${kis_brush_hud_properties_config_test_SRCS}) -target_link_libraries(KisBrushHudPropertiesConfigTest kritaui Qt5::Test) +krita_add_broken_unit_test( + kis_zoom_and_pan_test.cpp ../../../sdk/tests/testutil.cpp + TEST_NAME krita-ui-KisZoomAndPanTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) +#set_tests_properties(krita-ui-KisZoomAndPanTest PROPERTIES TIMEOUT 300) +krita_add_broken_unit_test( + kis_action_manager_test.cpp + TEST_NAME krita-ui-KisActionManagerTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +krita_add_broken_unit_test( + kis_categories_mapper_test.cpp testing_categories_mapper.cpp + TEST_NAME krita-ui-KisCategoriesMapperTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +krita_add_broken_unit_test( + kis_asl_layer_style_serializer_test.cpp + TEST_NAME krita-ui-KisAslLayerStyleSerializerTest + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +krita_add_broken_unit_test( + kis_animation_exporter_test.cpp + TEST_NAME kritaui-animation_exporter_test + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +krita_add_broken_unit_test( + kis_animation_importer_test.cpp + TEST_NAME kritaui-animation_importer_test + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +krita_add_broken_unit_test( + kis_animation_frame_cache_test.cpp + TEST_NAME kritaui-animation_frame_cache_test + LINK_LIBRARIES kritaui kritaimage Qt5::Test) + +krita_add_broken_unit_test( + ResourceBundleTest.cpp + TEST_NAME krita-resourcemanager-ResourceBundleTest + LINK_LIBRARIES kritaui kritalibbrush kritalibpaintop Qt5::Test) + +# FIXME this test doesn't compile +#ecm_add_test( +# kis_input_manager_test.cpp ../../../sdk/tests/testutil.cpp +# TEST_NAME krita-ui-KisInputManagerTest +# LINK_LIBRARIES kritaui kritaimage Qt5::Test) diff --git a/libs/widgets/tests/CMakeLists.txt b/libs/widgets/tests/CMakeLists.txt index 019ec1fac0..1b9c7fb4e1 100644 --- a/libs/widgets/tests/CMakeLists.txt +++ b/libs/widgets/tests/CMakeLists.txt @@ -1,32 +1,25 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/") add_definitions(-DFILES_OUTPUT_DIR="${CMAKE_CURRENT_BINARY_DIR}") #add_subdirectory(filedialogtester) -########### next target ############### - -set(zoomhandler_test_SRCS zoomhandler_test.cpp ) -kde4_add_unit_test(zoomhandler_test TESTNAME libs-widgets-zoomhandler_test ${zoomhandler_test_SRCS}) -target_link_libraries(zoomhandler_test kritawidgets Qt5::Test) - -########### next target ############### - -set(zoomcontroller_test_SRCS zoomcontroller_test.cpp ) -kde4_add_unit_test(zoomcontroller_test TESTNAME libs-widgets-zoomcontroller_test ${zoomcontroller_test_SRCS}) -target_link_libraries(zoomcontroller_test kritawidgets Qt5::Test) - -########### next target ############### - -set(KoResourceTaggingTest_SRCS KoResourceTaggingTest.cpp ) -kde4_add_broken_unit_test(KoResourceTaggingTest TESTNAME libs-widgets-KoResourceTaggingTest ${KoResourceTaggingTest_SRCS}) -target_link_libraries(KoResourceTaggingTest kritawidgets Qt5::Test) - -########### next target ############### - -set(kis_parse_spin_boxes_test_SRCS kis_parse_spin_boxes_test.cpp) -kde4_add_unit_test(KisParseSpinBoxesTest TESTNAME krita-ui-KisParseSpinBoxesTest ${kis_parse_spin_boxes_test_SRCS}) -target_link_libraries(KisParseSpinBoxesTest kritaui Qt5::Test) - -########### end ############### +include(ECMAddTests) +include(KritaAddBrokenUnitTest) + +ecm_add_tests( + zoomhandler_test.cpp + zoomcontroller_test.cpp + NAME_PREFIX "libs-widgets-" + LINK_LIBRARIES kritawidgets Qt5::Test) + +krita_add_broken_unit_test( + KoResourceTaggingTest.cpp + TEST_NAME libs-widgets-KoResourceTaggingTest + LINK_LIBRARIES kritawidgets Qt5::Test) + +ecm_add_tests( + kis_parse_spin_boxes_test.cpp + NAME_PREFIX "krita-ui-" + LINK_LIBRARIES kritaui Qt5::Test) diff --git a/libs/widgetutils/tests/CMakeLists.txt b/libs/widgetutils/tests/CMakeLists.txt index 768241c245..82c339e652 100644 --- a/libs/widgetutils/tests/CMakeLists.txt +++ b/libs/widgetutils/tests/CMakeLists.txt @@ -1,14 +1,16 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_SOURCE_DIR}/libs/widgetutils ) -########### next target ############### +include(ECMAddTests) -set(kopropertiestest_SRCS KoPropertiesTest.cpp ) -kde4_add_unit_test(KoPropertiesTest TESTNAME libs-widgetutils-KoPropertiesTest ${kopropertiestest_SRCS}) -target_link_libraries(KoPropertiesTest kritawidgetutils Qt5::Test) +ecm_add_tests( + KoPropertiesTest.cpp + NAME_PREFIX "libs-widgetutils-" + LINK_LIBRARIES kritawidgetutils Qt5::Test +) -########### next target ############### - -set(kis_simple_math_parser_test_SRCS kis_simple_math_parser_test.cpp) -kde4_add_unit_test(KisSimpleMathParserTest TESTNAME krita-ui-KisSimpleMathParserTest ${kis_simple_math_parser_test_SRCS}) -target_link_libraries(KisSimpleMathParserTest kritaui Qt5::Test) +# FIXME this test should be in the ui directory +ecm_add_test( + kis_simple_math_parser_test.cpp + TEST_NAME krita-ui-KisSimpleMathParserTest + LINK_LIBRARIES kritaui Qt5::Test) diff --git a/plugins/color/lcms2engine/tests/CMakeLists.txt b/plugins/color/lcms2engine/tests/CMakeLists.txt index 90e7da3409..295ee126fa 100644 --- a/plugins/color/lcms2engine/tests/CMakeLists.txt +++ b/plugins/color/lcms2engine/tests/CMakeLists.txt @@ -1,43 +1,34 @@ add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/") set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ../colorspaces/cmyk_u16 ../colorspaces/cmyk_u8 ../colorspaces/gray_u16 ../colorspaces/gray_u8 ../colorspaces/lab_u16 ../colorspaces/rgb_u16 ../colorspaces/rgb_u8 ../colorspaces/xyz_u16 ../colorprofiles .. ) if(OPENEXR_FOUND) include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR}) endif() include_directories( ${LCMS2_INCLUDE_DIR} ) if(MSVC OR (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) # avoid "cannot open file 'LIBC.lib'" error set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBC.LIB") endif() -########### next target ############### - -set(TestKoLcmsColorProfile_test_SRCS TestKoLcmsColorProfile.cpp ) - -kde4_add_unit_test(TestKoLcmsColorProfile TESTNAME libs-pigment-TestKoLcmsColorProfile ${TestKoLcmsColorProfile_test_SRCS}) - -target_link_libraries(TestKoLcmsColorProfile kritawidgets kritapigment KF5::I18n Qt5::Test ${LCMS2_LIBRARIES} ) - -########### next target ############### - -set(TestKoColorSpaceRegistry_test_SRCS TestKoColorSpaceRegistry.cpp ) - -kde4_add_broken_unit_test(TestKoColorSpaceRegistryLcms TESTNAME libs-pigment-TestKoColorSpaceRegistry ${TestKoColorSpaceRegistry_test_SRCS}) - -target_link_libraries(TestKoColorSpaceRegistryLcms kritawidgets kritapigment ${LCMS2_LIBRARIES} KF5::I18n Qt5::Test) +ecm_add_tests(TestKoLcmsColorProfile.cpp + NAME_PREFIX "libs-pigment-" + LINK_LIBRARIES kritawidgets kritapigment KF5::I18n Qt5::Test ${LCMS2_LIBRARIES}) +krita_add_broken_unit_test(TestKoColorSpaceRegistry.cpp + TEST_NAME libs-pigment-TestKoColorSpaceRegistry + LINK_LIBRARIES kritawidgets kritapigment ${LCMS2_LIBRARIES} KF5::I18n Qt5::Test) diff --git a/plugins/dockers/animation/tests/CMakeLists.txt b/plugins/dockers/animation/tests/CMakeLists.txt index ca942eff88..82089a462e 100644 --- a/plugins/dockers/animation/tests/CMakeLists.txt +++ b/plugins/dockers/animation/tests/CMakeLists.txt @@ -1,10 +1,10 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/sdk/tests ) macro_add_unittest_definitions() ########### next target ############### -set(timeline_model_test_SRCS timeline_model_test.cpp) -kde4_add_broken_unit_test(TimelineModelTest TESTNAME krita-ui-TimelineModelTest ${timeline_model_test_SRCS}) -target_link_libraries(TimelineModelTest ${KDE4_KDEUI_LIBS} kritaanimationdocker kritaui kritaimage ${QT_QTTEST_LIBRARY}) +krita_add_broken_unit_test(timeline_model_test.cpp + TEST_NAME krita-animation-TimelineModelTest + LINK_LIBRARIES ${KDE4_KDEUI_LIBS} kritaanimationdocker kritaui kritaimage Qt5::Test) diff --git a/plugins/dockers/lut/tests/CMakeLists.txt b/plugins/dockers/lut/tests/CMakeLists.txt index 16e31e5b1c..42a8985562 100644 --- a/plugins/dockers/lut/tests/CMakeLists.txt +++ b/plugins/dockers/lut/tests/CMakeLists.txt @@ -1,12 +1,12 @@ macro_add_unittest_definitions() include_directories(${CMAKE_SOURCE_DIR}/sdk/tests) include_directories(SYSTEM ${OCIO_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ) ########### next target ############### -set(kis_ocio_display_filter_test_SRCS kis_ocio_display_filter_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp) -kde4_add_broken_unit_test(KisOcioDisplayFilterTest TESTNAME krita-ocio-KisOcioDisplayFilterTest ${kis_ocio_display_filter_test_SRCS}) -target_link_libraries(KisOcioDisplayFilterTest kritaimage kritaui kritalutdocker ${OCIO_LIBRARIES} KF5::I18n Qt5::Test) +krita_add_broken_unit_test(kis_ocio_display_filter_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp + TEST_NAME krita-ocio-KisOcioDisplayFilterTest + LINK_LIBRARIES kritaimage kritaui kritalutdocker ${OCIO_LIBRARIES} KF5::I18n Qt5::Test) diff --git a/plugins/filters/tests/CMakeLists.txt b/plugins/filters/tests/CMakeLists.txt index 9da811b6d8..80eaef3e4a 100644 --- a/plugins/filters/tests/CMakeLists.txt +++ b/plugins/filters/tests/CMakeLists.txt @@ -1,16 +1,12 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ) macro_add_unittest_definitions() ########### next target ############### -set(kis_all_filter_test_SRCS kis_all_filter_test.cpp ) -kde4_add_executable(KisAllFilterTest TEST ${kis_all_filter_test_SRCS}) -target_link_libraries(KisAllFilterTest kritaimage Qt5::Test) - -########### next target ############### - -set(kis_crash_filter_test_SRCS kis_crash_filter_test.cpp ) -kde4_add_executable(KisCrashFilterTest TEST ${kis_crash_filter_test_SRCS}) -target_link_libraries(KisCrashFilterTest kritaimage Qt5::Test) +ecm_add_tests( + kis_all_filter_test.cpp + kis_crash_filter_test.cpp + NAME_PREFIX "krita-filters-" + LINK_LIBRARIES kritaimage Qt5::Test) diff --git a/plugins/filters/unsharp/tests/CMakeLists.txt b/plugins/filters/unsharp/tests/CMakeLists.txt index 1338676edc..19bef9a891 100644 --- a/plugins/filters/unsharp/tests/CMakeLists.txt +++ b/plugins/filters/unsharp/tests/CMakeLists.txt @@ -1,8 +1,9 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests ) macro_add_unittest_definitions() -set(kis_unsharp_mask_test_SRCS kis_unsharp_mask_test.cpp ) -kde4_add_unit_test(KisUnsharpMaskTest TESTNAME krita-ui-kis_unsharp_mask_test ${kis_unsharp_mask_test_SRCS}) -target_link_libraries(KisUnsharpMaskTest kritaui Qt5::Test) +ecm_add_tests( + kis_unsharp_mask_test.cpp + NAME_PREFIX "krita-filters-unsharp-" + LINK_LIBRARIES kritaui Qt5::Test) diff --git a/plugins/impex/csv/tests/CMakeLists.txt b/plugins/impex/csv/tests/CMakeLists.txt index 5a53358c49..7bfb5de7f8 100644 --- a/plugins/impex/csv/tests/CMakeLists.txt +++ b/plugins/impex/csv/tests/CMakeLists.txt @@ -1,11 +1,10 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests ) -macro_add_unittest_definitions() - -########### next target ############### -set(kis_csv_test_SRCS kis_csv_test.cpp ) +include(KritaAddBrokenUnitTest) -kde4_add_unit_test(kis_csv_test TESTNAME krita-plugins-formats-csv_test ${kis_csv_test_SRCS}) +macro_add_unittest_definitions() -target_link_libraries(kis_csv_test kritaui Qt5::Test) +krita_add_broken_unit_test(kis_csv_test.cpp + TEST_NAME krita-plugin-format-csv_test + LINK_LIBRARIES kritaui Qt5::Test) diff --git a/plugins/impex/exr/tests/CMakeLists.txt b/plugins/impex/exr/tests/CMakeLists.txt index 1b282d40e1..89cecfa3b5 100644 --- a/plugins/impex/exr/tests/CMakeLists.txt +++ b/plugins/impex/exr/tests/CMakeLists.txt @@ -1,11 +1,10 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests ) -macro_add_unittest_definitions() - -########### next target ############### -set(kis_exr_test_SRCS kis_exr_test.cpp ) +include(KritaAddBrokenUnitTest) -kde4_add_broken_unit_test(kis_exr_test TESTNAME krita-fileformat-kis_exr_test ${kis_exr_test_SRCS}) +macro_add_unittest_definitions() -target_link_libraries(kis_exr_test kritaui Qt5::Test) +krita_add_broken_unit_test(kis_exr_test.cpp + TEST_NAME krita-plugin-format-exr_test + LINK_LIBRARIES kritaui Qt5::Test) diff --git a/plugins/impex/jpeg/tests/CMakeLists.txt b/plugins/impex/jpeg/tests/CMakeLists.txt index dba87f17e6..0b855d988b 100644 --- a/plugins/impex/jpeg/tests/CMakeLists.txt +++ b/plugins/impex/jpeg/tests/CMakeLists.txt @@ -1,10 +1,9 @@ #set EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_SOURCE_DIR}/sdk/tests) +include(KritaAddBrokenUnitTest) macro_add_unittest_definitions() -########### next target ############### - -set(kis_jpeg_test_SRCS kis_jpeg_test.cpp ) -kde4_add_broken_unit_test(kis_jpeg_test TESTNAME krita-plugin-format-jpeg_test ${kis_jpeg_test_SRCS}) -target_link_libraries(kis_jpeg_test kritaui Qt5::Test) +krita_add_broken_unit_test(kis_jpeg_test.cpp + TEST_NAME krita-plugin-format-jpeg_test + LINK_LIBRARIES kritaui Qt5::Test) diff --git a/plugins/impex/png/tests/CMakeLists.txt b/plugins/impex/png/tests/CMakeLists.txt index 52226f71db..71ca8f1e13 100644 --- a/plugins/impex/png/tests/CMakeLists.txt +++ b/plugins/impex/png/tests/CMakeLists.txt @@ -1,8 +1,10 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests ) +include(KritaAddBrokenUnitTest) + macro_add_unittest_definitions() -set(kis_png_test_SRCS kis_png_test.cpp ) -kde4_add_broken_unit_test(kis_png_test TESTNAME krita-plugins-formats-png_test ${kis_png_test_SRCS}) -target_link_libraries(kis_png_test kritaui Qt5::Test) +krita_add_broken_unit_test(kis_png_test.cpp + TEST_NAME krita-plugin-format-png_test + LINK_LIBRARIES kritaui Qt5::Test) diff --git a/plugins/impex/ppm/tests/CMakeLists.txt b/plugins/impex/ppm/tests/CMakeLists.txt index 9dbc21f81e..c4cf8b1f74 100644 --- a/plugins/impex/ppm/tests/CMakeLists.txt +++ b/plugins/impex/ppm/tests/CMakeLists.txt @@ -1,11 +1,10 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests ) -macro_add_unittest_definitions() - -########### next target ############### -set(kis_ppm_test_SRCS kis_ppm_test.cpp ) +include(KritaAddBrokenUnitTest) -kde4_add_broken_unit_test(kis_ppm_test TESTNAME krita-plugin-format-ppm_test ${kis_ppm_test_SRCS}) +macro_add_unittest_definitions() -target_link_libraries(kis_ppm_test kritaui Qt5::Test) +krita_add_broken_unit_test(kis_ppm_test.cpp + TEST_NAME krita-plugin-format-ppm_test + LINK_LIBRARIES kritaui Qt5::Test) diff --git a/plugins/impex/psd/tests/CMakeLists.txt b/plugins/impex/psd/tests/CMakeLists.txt index 56588926aa..f9f727239f 100644 --- a/plugins/impex/psd/tests/CMakeLists.txt +++ b/plugins/impex/psd/tests/CMakeLists.txt @@ -1,48 +1,37 @@ include_directories(${CMAKE_BINARY_DIR}/libs/psd) #For kispsd_include.h include_directories(${CMAKE_BINARY_DIR}/libs/pigment) set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/sdk/tests ${CMAKE_SOURCE_DIR}/libs/psd ${CMAKE_SOURCE_DIR}/plugins/impex/psd ${CMAKE_SOURCE_DIR}/libs/pigment ) macro_add_unittest_definitions() if (WIN32) set(PSD_TEST_LIBS kritapsd Qt5::Test ${WIN32_PLATFORM_NET_LIBS}) else (WIN32) set(PSD_TEST_LIBS kritapsd Qt5::Test) endif (WIN32) -########### next target ############### - -set(psd_header_test_SRCS psd_header_test.cpp ../psd_header.cpp) -kde4_add_unit_test(psd_header_test TESTNAME krita-psd-psd_header_test ${psd_header_test_SRCS}) -target_link_libraries(psd_header_test kritaglobal KF5::I18n ${PSD_TEST_LIBS}) - -########### next target ############### - -set(psd_utils_test_SRCS psd_utils_test.cpp) -kde4_add_unit_test(psd_utils_test TESTNAME krita-psd-psd_utils_test ${psd_utils_test_SRCS}) -target_link_libraries(psd_utils_test ${PSD_TEST_LIBS}) - -########### next target ############### - -set(psd_colormode_block_test_SRCS psd_colormode_block_test.cpp ../psd_header.cpp ../psd_colormode_block.cpp) -kde4_add_unit_test(psd_colormode_block_test TESTNAME krita-psd-psd_colormode_block_test ${psd_colormode_block_test_SRCS}) -target_link_libraries(psd_colormode_block_test kritaglobal KF5::I18n Qt5::Gui ${PSD_TEST_LIBS}) - -########### next target ############### - -set(compression_test_SRCS compression_test.cpp) -kde4_add_unit_test(compression_test TESTNAME krita-psd-compression_test ${compression_test_SRCS}) -target_link_libraries(compression_test ${PSD_TEST_LIBS}) - -########### next target ############### -set(kis_psd_test_SRCS kis_psd_test.cpp ) -kde4_add_broken_unit_test(kis_psd_test TESTNAME krita-plugins-formats-psd_test ${kis_psd_test_SRCS}) -target_link_libraries(kis_psd_test ${PSD_TEST_LIBS} kritaui) +ecm_add_tests( + psd_utils_test.cpp + compression_test.cpp + NAME_PREFIX "krita-psd-" + LINK_LIBRARIES ${PSD_TEST_LIBS}) + +ecm_add_test(psd_header_test.cpp ../psd_header.cpp + TEST_NAME krita-psd-psd_header_test + LINK_LIBRARIES kritaglobal KF5::I18n ${PSD_TEST_LIBS}) + +ecm_add_test(psd_colormode_block_test.cpp ../psd_header.cpp ../psd_colormode_block.cpp + TEST_NAME krita-psd-psd_colormode_block_test + LINK_LIBRARIES kritaglobal KF5::I18n Qt5::Gui ${PSD_TEST_LIBS}) + +krita_add_broken_unit_test(kis_psd_test.cpp + TEST_NAME krita-plugins-formats-psd_test + LINK_LIBRARIES ${PSD_TEST_LIBS} kritaui) diff --git a/plugins/impex/tiff/tests/CMakeLists.txt b/plugins/impex/tiff/tests/CMakeLists.txt index f5f9d5864b..9c7bbea85c 100644 --- a/plugins/impex/tiff/tests/CMakeLists.txt +++ b/plugins/impex/tiff/tests/CMakeLists.txt @@ -1,15 +1,14 @@ if(LCMS2_FOUND) add_definitions( -DHAVE_LCMS2 ) endif() set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) -include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests ) +include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests ) -macro_add_unittest_definitions() - -########### next target ############### -set(kis_tiff_test_SRCS kis_tiff_test.cpp ) +include(KritaAddBrokenUnitTest) -kde4_add_broken_unit_test(kis_tiff_test TESTNAME krita-plugins-formats-tiff_test ${kis_tiff_test_SRCS}) +macro_add_unittest_definitions() -target_link_libraries(kis_tiff_test kritaui Qt5::Test) +krita_add_broken_unit_test(kis_tiff_test.cpp + TEST_NAME krita-plugin-format-tiff_test + LINK_LIBRARIES kritaui Qt5::Test) diff --git a/plugins/impex/xcf/tests/CMakeLists.txt b/plugins/impex/xcf/tests/CMakeLists.txt index 2f573590d2..4dc0479cdd 100644 --- a/plugins/impex/xcf/tests/CMakeLists.txt +++ b/plugins/impex/xcf/tests/CMakeLists.txt @@ -1,11 +1,10 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests ) -macro_add_unittest_definitions() - -########### next target ############### -set(kis_xcf_test_SRCS kis_xcf_test.cpp ) +include(KritaAddBrokenUnitTest) -kde4_add_broken_unit_test(kis_xcf_test TESTNAME krita-plugin-format-xcf_test ${kis_xcf_test_SRCS}) +macro_add_unittest_definitions() -target_link_libraries(kis_xcf_test kritaui Qt5::Test) +krita_add_broken_unit_test(kis_xcf_test.cpp + TEST_NAME krita-plugin-format-xcf_test + LINK_LIBRARIES kritaui Qt5::Test) diff --git a/plugins/paintops/defaultpaintops/brush/tests/CMakeLists.txt b/plugins/paintops/defaultpaintops/brush/tests/CMakeLists.txt index 6c4d94619c..9bf327df1b 100644 --- a/plugins/paintops/defaultpaintops/brush/tests/CMakeLists.txt +++ b/plugins/paintops/defaultpaintops/brush/tests/CMakeLists.txt @@ -1,10 +1,10 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests ) -macro_add_unittest_definitions() +include(KritaAddBrokenUnitTest) -########### next target ############### +macro_add_unittest_definitions() -set(kis_brushop_test_SRCS kis_brushop_test.cpp ../../../../../sdk/tests/stroke_testing_utils.cpp) -kde4_add_broken_unit_test(KisBrushOpTest TESTNAME krita-plugins-KisBrushOpTest ${kis_brushop_test_SRCS}) -target_link_libraries(KisBrushOpTest kritaimage kritaui kritalibpaintop Qt5::Test) +krita_add_broken_unit_test(kis_brushop_test.cpp ../../../../../sdk/tests/stroke_testing_utils.cpp + TEST_NAME krita-plugins-KisBrushOpTest + LINK_LIBRARIES kritaimage kritaui kritalibpaintop Qt5::Test) diff --git a/plugins/paintops/libpaintop/tests/CMakeLists.txt b/plugins/paintops/libpaintop/tests/CMakeLists.txt index a435f43ff6..d38c247878 100644 --- a/plugins/paintops/libpaintop/tests/CMakeLists.txt +++ b/plugins/paintops/libpaintop/tests/CMakeLists.txt @@ -1,10 +1,13 @@ ########### next target ############### include_directories( ${CMAKE_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/sdk/tests ) -set(kis_sensors_test_SRCS kis_sensors_test.cpp ) -kde4_add_unit_test(KisSensorsTest TESTNAME krita-paintop-SensorsTest ${kis_sensors_test_SRCS}) -target_link_libraries(KisSensorsTest kritaimage kritalibpaintop Qt5::Test) -set(kis_embedded_pattern_manager_test_SRCS kis_embedded_pattern_manager_test.cpp ) -kde4_add_broken_unit_test(KisEmbeddedPatternManagerTest TESTNAME krita-paintop-EmbeddedPatternManagerTest ${kis_embedded_pattern_manager_test_SRCS}) -target_link_libraries(KisEmbeddedPatternManagerTest kritaimage kritalibpaintop Qt5::Test) +include(KritaAddBrokenUnitTest) + +ecm_add_test(kis_sensors_test.cpp + TEST_NAME krita-paintop-SensorsTest + LINK_LIBRARIES kritaimage kritalibpaintop Qt5::Test) + +krita_add_broken_unit_test(kis_embedded_pattern_manager_test.cpp + TEST_NAME krita-paintop-EmbeddedPatternManagerTest + LINK_LIBRARIES kritaimage kritalibpaintop Qt5::Test) diff --git a/plugins/tools/basictools/tests/CMakeLists.txt b/plugins/tools/basictools/tests/CMakeLists.txt index cb93697787..4cf3933e76 100644 --- a/plugins/tools/basictools/tests/CMakeLists.txt +++ b/plugins/tools/basictools/tests/CMakeLists.txt @@ -1,18 +1,20 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/sdk/tests ${CMAKE_BINARY_DIR}/plugins/tools/basictools) + + macro_add_unittest_definitions() ########### next target ############### -set(move_stroke_test_SRCS move_stroke_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp ../strokes/move_stroke_strategy.cpp) -kde4_add_broken_unit_test(MoveStrokeTest TESTNAME krita-basictools-MoveStrokeTest ${move_stroke_test_SRCS}) -target_link_libraries(MoveStrokeTest kritabasicflakes kritaui Qt5::Test) +krita_add_broken_unit_test(move_stroke_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp ../strokes/move_stroke_strategy.cpp + TEST_NAME krita-basictools-MoveStrokeTest + LINK_LIBRARIES kritabasicflakes kritaui Qt5::Test) ########### next target ############### -set(move_selection_stroke_test_SRCS move_selection_stroke_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp ../strokes/move_selection_stroke_strategy.cpp) -kde4_add_unit_test(MoveSelectionStrokeTest TESTNAME krita-basictools-MoveSelectionStrokeTest ${move_selection_stroke_test_SRCS}) -target_link_libraries(MoveSelectionStrokeTest kritabasicflakes kritaui Qt5::Test) +ecm_add_test(move_selection_stroke_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp ../strokes/move_selection_stroke_strategy.cpp + TEST_NAME krita-basictools-MoveSelectionStrokeTest + LINK_LIBRARIES kritabasicflakes kritaui Qt5::Test) diff --git a/plugins/tools/tool_transform2/tests/CMakeLists.txt b/plugins/tools/tool_transform2/tests/CMakeLists.txt index 136da4caa7..06d9b36d81 100644 --- a/plugins/tools/tool_transform2/tests/CMakeLists.txt +++ b/plugins/tools/tool_transform2/tests/CMakeLists.txt @@ -1,19 +1,19 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_SOURCE_DIR}/sdk/tests ${Boost_INCLUDE_DIRS} ) macro_add_unittest_definitions() ########### next target ############### -set(test_save_load_transform_args_SRCS test_save_load_transform_args.cpp ) -kde4_add_broken_unit_test(TestSaveLoadTransformArgs TESTNAME krita-ui-TestSaveLoadTransformArgs ${test_save_load_transform_args_SRCS}) -target_link_libraries(TestSaveLoadTransformArgs kritatooltransform kritaui kritaimage Qt5::Test) +krita_add_broken_unit_test(test_save_load_transform_args.cpp + TEST_NAME krita-ui-TestSaveLoadTransformArgs + LINK_LIBRARIES kritatooltransform kritaui kritaimage Qt5::Test) -set(test_animated_transform_parameters_SRCS test_animated_transform_parameters.cpp ) -kde4_add_broken_unit_test(TestAnimatedTransformParameters TESTNAME krita-ui-TestAnimatedTransformParameters ${test_animated_transform_parameters_SRCS}) -target_link_libraries(TestAnimatedTransformParameters kritatooltransform kritaui kritaimage Qt5::Test) +krita_add_broken_unit_test(test_animated_transform_parameters.cpp + TEST_NAME krita-ui-TestAnimatedTransformParameters + LINK_LIBRARIES kritatooltransform kritaui kritaimage Qt5::Test)