Commit 25428d2d authored by Boudewijn Rempt's avatar Boudewijn Rempt

more build fixes

parent 6fec7892
......@@ -349,7 +349,7 @@ if(BUILD_TESTING)
add_definitions(-DCOMPILING_TESTS)
endif()
set(KRITA_DEFAULT_TEST_DATA_DIR ${CMAKE_SOURCE_DIR}/krita/sdk/tests/data/)
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}")
......
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_SOURCE_DIR}/krita/image/tiles3 ${CMAKE_SOURCE_DIR}/krita/sdk/tests)
include_directories( ${CMAKE_SOURCE_DIR}/krita/image/tiles3 ${CMAKE_SOURCE_DIR}/sdk/tests)
set(LINK_VC_LIB)
......
......@@ -36,7 +36,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/processing
${CMAKE_CURRENT_SOURCE_DIR}/recorder
${CMAKE_CURRENT_SOURCE_DIR}/tiles3
${CMAKE_SOURCE_DIR}/krita/sdk/tests
${CMAKE_SOURCE_DIR}/sdk/tests
${EIGEN3_INCLUDE_DIR}
)
......
......@@ -15,7 +15,7 @@ include_directories(${CMAKE_SOURCE_DIR}/libs/image/metadata
${CMAKE_SOURCE_DIR}/libs/image/brushengine
${CMAKE_SOURCE_DIR}/libs/image/tiles3
${CMAKE_SOURCE_DIR}/libs/image/tiles3/swap
${CMAKE_SOURCE_DIR}/krita/sdk/tests
${CMAKE_SOURCE_DIR}/sdk/tests
${EIGEN3_INCLUDE_DIR}
${FLAKE_INCLUDES}
)
......
......@@ -5,7 +5,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/krita/ui
${CMAKE_SOURCE_DIR}/krita/plugins/paintops/libbrush
${CMAKE_SOURCE_DIR}/krita/plugins/paintops/libpaintop
${CMAKE_SOURCE_DIR}/krita/sdk/tests
${CMAKE_SOURCE_DIR}/sdk/tests
${CMAKE_SOURCE_DIR}/krita/plugins/paintops/resourcemanager)
macro_add_unittest_definitions()
......
include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests ${CMAKE_CURRENT_BINARY_DIR}/..)
include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests ${CMAKE_CURRENT_BINARY_DIR}/..)
macro_add_unittest_definitions()
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests ../)
include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests ../)
macro_add_unittest_definitions()
......
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KRITA_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
include_directories( ${KRITA_INCLUDES} ${CMAKE_SOURCE_DIR}/sdk/tests )
macro_add_unittest_definitions()
......
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests )
macro_add_unittest_definitions()
......
#set EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_SOURCE_DIR}/krita/sdk/tests)
include_directories(${CMAKE_SOURCE_DIR}/sdk/tests)
macro_add_unittest_definitions()
......
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests )
macro_add_unittest_definitions()
......
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests )
macro_add_unittest_definitions()
......
......@@ -3,7 +3,7 @@ include_directories(${CMAKE_BINARY_DIR}/krita/libpsd) #For kispsd_include.h
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories(
${CMAKE_SOURCE_DIR}/..
${CMAKE_SOURCE_DIR}/krita/sdk/tests
${CMAKE_SOURCE_DIR}/sdk/tests
${CMAKE_SOURCE_DIR}/libs/psd
)
......
......@@ -3,7 +3,7 @@ if(LCMS2_FOUND)
endif()
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests )
macro_add_unittest_definitions()
......
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests )
macro_add_unittest_definitions()
......
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
include_directories( ${CMAKE_SOURCE_DIR}/sdk/tests )
macro_add_unittest_definitions()
......
########### next target ###############
include_directories( ${CMAKE_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
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( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/sdk/tests )
macro_add_unittest_definitions()
########### next target ###############
set(move_stroke_test_SRCS move_stroke_test.cpp ${CMAKE_SOURCE_DIR}/krita/sdk/tests/stroke_testing_utils.cpp)
set(move_stroke_test_SRCS move_stroke_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp)
kde4_add_unit_test(MoveStrokeTest TESTNAME krita-ui-MoveStrokeTest ${move_stroke_test_SRCS})
target_link_libraries(MoveStrokeTest kritabasicflakes kritadefaulttools kritaui kritaimage Qt5::Test)
########### next target ###############
set(move_selection_stroke_test_SRCS move_selection_stroke_test.cpp ${CMAKE_SOURCE_DIR}/krita/sdk/tests/stroke_testing_utils.cpp)
set(move_selection_stroke_test_SRCS move_selection_stroke_test.cpp ${CMAKE_SOURCE_DIR}/sdk/tests/stroke_testing_utils.cpp)
kde4_add_unit_test(MoveSelectionStrokeTest TESTNAME krita-ui-MoveSelectionStrokeTest ${move_selection_stroke_test_SRCS})
target_link_libraries(MoveSelectionStrokeTest kritabasicflakes kritadefaulttools kritaui kritaimage Qt5::Test)
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KOWIDGETS_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
include_directories( ${KOWIDGETS_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_SOURCE_DIR}/sdk/tests )
macro_add_unittest_definitions()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment