Fix duplicated KOWIDGETS_INCLUDES definition

parent 93bc7363
......@@ -810,7 +810,6 @@ set(PIGMENT_INCLUDES ${KOPLUGIN_INCLUDES}
# flake depends on koodf and pigment
set(FLAKE_INCLUDES ${CMAKE_SOURCE_DIR}/libs/flake
${KOODF_INCLUDES}
${KOPLUGIN_INCLUDES}
${PIGMENT_INCLUDES}
${KUNDO2_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/widgetutils
......@@ -840,22 +839,18 @@ set(KOTEXT_INCLUDES ${CMAKE_SOURCE_DIR}/libs/kotext
set(TEXTLAYOUT_INCLUDES ${KOTEXT_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/textlayout)
# Widgets depends on flake
set(KOWIDGETS_INCLUDES ${FLAKE_INCLUDES}
# Widgets depends on kotext and flake
set(KOWIDGETS_INCLUDES ${KOTEXT_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/widgetutils
${CMAKE_BINARY_DIR}/libs/widgetutils
${CMAKE_SOURCE_DIR}/libs/widgets
${CMAKE_BINARY_DIR}/libs/widgets)
# BasicFlakes depends on flake, widgets
set(BASICFLAKES_INCLUDES ${FLAKE_INCLUDES}
set(BASICFLAKES_INCLUDES ${KOWIDGETS_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/basicflakes
${CMAKE_SOURCE_DIR}/libs/basicflakes/tools)
set(KOWIDGETS_INCLUDES
${BASICFLAKES_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/widgets
${CMAKE_SOURCE_DIR}/libs/widgetutils)
# komain depends on kotext & flake
set(KOMAIN_INCLUDES
......
......@@ -41,7 +41,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-memory-leak-tracker.h.cmake ${
include_directories(
${CMAKE_SOURCE_DIR}/krita/image/metadata
${CMAKE_BINARY_DIR}/libs/widgets
3rdparty
)
......
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