Fix unittests' data output directory on Windows

The output files should be written into the same directory,
where the unuttest binary resides. On Windows this directory
is not the same as ${CMAKE_CURRENT_BINARY_DIR} because of
linking complications.

The patch also removes the usage of EXECUTABLE_OUTPUT_PATH,
which is deprecated and not used anymore.

CMakeLists.txt

@@ -525,7 +525,7 @@ kde_enable_exceptions()
 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_OUTPUT_DIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
   add_definitions(-DFILES_DEFAULT_DATA_DIR="${KRITA_DEFAULT_TEST_DATA_DIR}")
   add_definitions(-DSYSTEM_RESOURCES_DATA_DIR="${CMAKE_SOURCE_DIR}/krita/data/")
 endmacro()

benchmarks/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(
     ${CMAKE_SOURCE_DIR}/sdk/tests
     ${CMAKE_SOURCE_DIR}/libs/pigment

cmake/modules/MacroKritaAddBenchmark.cmake

@@ -50,7 +50,7 @@ macro (KRITA_ADD_BENCHMARK _test_NAME)
       set(_executable "${loc}.bat")
     else()
       if (Q_OS_MACOS AND NOT _nogui)
-        set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}.app/Contents/MacOS/${_test_NAME})
+        set(_executable ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_test_NAME}.app/Contents/MacOS/${_test_NAME})
       else ()
         # .shell because of rpath handling
         set(_executable "${loc}.shell")
@@ -66,7 +66,7 @@ macro (KRITA_ADD_BENCHMARK _test_NAME)
     endif ()
 
     add_dependencies(benchmark ${_targetName} )
-#    add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_test_NAME}.tml )
+#    add_test( ${_targetName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_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

libs/brush/tests/CMakeLists.txt

 ########### next target ###############
 
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(
     ${CMAKE_SOURCE_DIR}/libs/image/metadata
     ${CMAKE_SOURCE_DIR}/sdk/tests

libs/flake/resources/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include(ECMAddTests)
 
 include_directories(${CMAKE_SOURCE_DIR}/sdk/tests)

libs/flake/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include(ECMAddTests)
 include(KritaAddBrokenUnitTest)
 

libs/image/tiles3/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(   
     ${CMAKE_BINARY_DIR}/libs/image
 )

libs/libkis/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include(ECMAddTests)
 include(KritaAddBrokenUnitTest)
 

libs/metadata/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include(ECMAddTests)
 include(KritaAddBrokenUnitTest)
 

libs/pigment/benchmarks/CMakeLists.txt

-
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-
 ########### next target ###############
 
 set(ko_colorspaces_benchmark_SRCS KoColorSpacesBenchmark.cpp)

libs/pigment/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
-add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/")
+macro_add_unittest_definitions()
 
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../colorspaces )
 

libs/resources/tests/CMakeLists.txt

-add_definitions(-DFILES_DEST_DIR="${CMAKE_CURRENT_BINARY_DIR}/data/")
-
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include(ECMAddTests)
 include(KritaAddBrokenUnitTest)
 
 macro_add_unittest_definitions()
 
+add_definitions(-DFILES_DEST_DIR="${CMAKE_CURRENT_BINARY_DIR}/data/")
+
 ecm_add_tests(
     TestResourceCacheDb
     TestResourceLoaderRegistry

libs/store/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+macro_add_unittest_definitions()
 
 include(ECMAddTests)
 

libs/ui/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include_directories(${CMAKE_SOURCE_DIR}/libs/image/metadata
                     ${CMAKE_SOURCE_DIR}/sdk/tests )
 

libs/widgets/tests/CMakeLists.txt

-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}")
+macro_add_unittest_definitions()
 
 #add_subdirectory(filedialogtester)
 

libs/widgetutils/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+macro_add_unittest_definitions()
+
 include_directories (
     ${CMAKE_SOURCE_DIR}/libs/widgetutils
     ${CMAKE_SOURCE_DIR}/sdk/tests

plugins/color/lcms2engine/tests/CMakeLists.txt

-add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/")
+macro_add_unittest_definitions()
 
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories( ../colorspaces/cmyk_u16
     ../colorspaces/cmyk_u8
     ../colorspaces/gray_u16

plugins/dockers/animation/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(   ${CMAKE_CURRENT_SOURCE_DIR}/..  ${CMAKE_SOURCE_DIR}/sdk/tests ${CMAKE_CURRENT_BINARY_DIR}/..)
 
 macro_add_unittest_definitions()

plugins/dockers/layerdocker/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-  
 include_directories(${CMAKE_SOURCE_DIR}/libs/image/metadata
                     ${CMAKE_SOURCE_DIR}/sdk/tests )
 include(ECMAddTests)

plugins/dockers/storyboarddocker/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/.. 
     ${CMAKE_SOURCE_DIR}/libs/ui/tests 
@@ -16,4 +14,4 @@ ecm_add_tests(
 
     NAME_PREFIX "plugins-dockers-storyboarddocker-"
     LINK_LIBRARIES kritastoryboarddocker kritaui Qt5::Test
-)
\ No newline at end of file
+)

plugins/extensions/qmic/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_BINARY_DIR}/plugins/extensions/qmic

plugins/filters/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories(    )
-
 macro_add_unittest_definitions()
 ##### Tests that currently fail and should be fixed #####
 

plugins/filters/unsharp/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 macro_add_unittest_definitions()

plugins/generators/screentone/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include_directories(
     ${CMAKE_SOURCE_DIR}/sdk/tests
 )

plugins/generators/seexpr/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include_directories(
     ${CMAKE_SOURCE_DIR}/sdk/tests
 )

plugins/impex/brush/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
+include_directories(${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)
 

plugins/impex/csv/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/impex/exr/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/impex/gif/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/impex/heif/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/impex/heightmap/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/impex/jp2/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/impex/jpeg/tests/CMakeLists.txt

-#set EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/sdk/tests)
 include(KritaAddBrokenUnitTest)
 

plugins/impex/libkra/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests )
 
-macro_add_unittest_definitions()
 macro_add_unittest_definitions()
 
 ecm_add_tests(

plugins/impex/ora/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)
 
-macro_add_unittest_definitions()
 macro_add_unittest_definitions()
 
 krita_add_broken_unit_test( KisOraTest.cpp

plugins/impex/pdf/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/impex/png/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
-include(KritaAddBrokenUnitTest)
-
 macro_add_unittest_definitions()
 include(KritaAddBrokenUnitTest)
 

plugins/impex/psd/tests/CMakeLists.txt

 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

plugins/impex/qimageio/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/impex/qml/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/impex/raw/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/impex/svg/tests/CMakeLists.txt

-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/sdk/tests)
 include(ECMAddTests)
 macro_add_unittest_definitions()

plugins/impex/tga/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/impex/tiff/tests/CMakeLists.txt

@@ -2,7 +2,6 @@ if(LCMS2_FOUND)
   add_definitions( -DHAVE_LCMS2 )
 endif()
 
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(ECMAddTests)

plugins/impex/xcf/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/paintops/defaultpaintops/brush/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(     ${CMAKE_SOURCE_DIR}/sdk/tests )
 
 include(KritaAddBrokenUnitTest)

plugins/paintops/mypaint/tests/CMakeLists.txt

 ########### next target ###############
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories( ${CMAKE_SOURCE_DIR}/..    ${CMAKE_SOURCE_DIR}/sdk/tests )
 include_directories(${LIBMYPAINT_INCLUDE_DIR})
 link_directories(${LIBMYPAINT_LIBRARIES})

plugins/tools/basictools/tests/CMakeLists.txt

-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)

plugins/tools/tool_transform2/tests/CMakeLists.txt

-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_CURRENT_BINARY_DIR}/..