[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/krita-mvc-rempt] krita: Remove old KOMVC_INCLUDES
From: Boudewijn Rempt <boud () valdyas ! org>
Date: 2014-12-01 11:08:44
Message-ID: E1XvOqS-0004xc-UZ () scm ! kde ! org
[Download RAW message or body]
Git commit fba457821bd3c3e35b950a22f7af5d92916ab9a1 by Boudewijn Rempt.
Committed on 01/12/2014 at 10:07.
Pushed by rempt into branch 'krita-mvc-rempt'.
Remove old KOMVC_INCLUDES
M +1 -1 krita/benchmarks/CMakeLists.txt
M +1 -1 krita/image/CMakeLists.txt
M +1 -1 krita/image/tests/CMakeLists.txt
M +1 -1 krita/image/tiles3/tests/CMakeLists.txt
M +1 -1 krita/libbrush/tests/CMakeLists.txt
M +1 -1 krita/plugins/extensions/gmic/tests/CMakeLists.txt
M +1 -1 krita/plugins/extensions/resourcemanager/tests/CMakeLists.txt
M +1 -1 krita/plugins/filters/tests/CMakeLists.txt
M +1 -1 krita/plugins/formats/exr/tests/CMakeLists.txt
M +1 -1 krita/plugins/formats/jpeg/tests/CMakeLists.txt
M +1 -1 krita/plugins/formats/png/tests/CMakeLists.txt
M +1 -1 krita/plugins/formats/ppm/tests/CMakeLists.txt
M +1 -1 krita/plugins/formats/psd/tests/CMakeLists.txt
M +1 -1 krita/plugins/formats/tiff/tests/CMakeLists.txt
M +1 -1 krita/plugins/formats/xcf/tests/CMakeLists.txt
M +1 -1 krita/plugins/paintops/defaultpaintops/brush/tests/CMakeList=
s.txt
M +1 -1 krita/plugins/tools/defaulttools/tests/CMakeLists.txt
M +1 -1 krita/ui/CMakeLists.txt
http://commits.kde.org/calligra/fba457821bd3c3e35b950a22f7af5d92916ab9a1
diff --git a/krita/benchmarks/CMakeLists.txt b/krita/benchmarks/CMakeLists.=
txt
index 20f2f23..ac87547 100644
--- a/krita/benchmarks/CMakeLists.txt
+++ b/krita/benchmarks/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/image/t=
iles3 ${CMAKE_SOURCE_DIR}/krita/sdk/tests)
+include_directories( ${CMAKE_SOURCE_DIR}/krita/image/tiles3 ${CMAKE_SOU=
RCE_DIR}/krita/sdk/tests)
=
=
set(LINK_VC_LIB)
diff --git a/krita/image/CMakeLists.txt b/krita/image/CMakeLists.txt
index 160dbf9..6860fa8 100644
--- a/krita/image/CMakeLists.txt
+++ b/krita/image/CMakeLists.txt
@@ -40,7 +40,7 @@ option(HAVE_BACKTRACE_SUPPORT "Enable recording of backtr=
ace in memory leak trac
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-memory-leak-tracker.h.cm=
ake ${CMAKE_CURRENT_BINARY_DIR}/config-memory-leak-tracker.h) ### WRONG PLA=
CE???
=
include_directories( ${CMAKE_SOURCE_DIR}/krita/image/metadata
- ${KOMVC_INCLUDES}
+ =
)
=
if(FFTW3_FOUND)
diff --git a/krita/image/tests/CMakeLists.txt b/krita/image/tests/CMakeList=
s.txt
index dde37d8..d5e9311 100644
--- a/krita/image/tests/CMakeLists.txt
+++ b/krita/image/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/image/m=
etadata ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
+include_directories( ${CMAKE_SOURCE_DIR}/krita/image/metadata ${CMAKE_S=
OURCE_DIR}/krita/sdk/tests )
=
macro_add_unittest_definitions()
=
diff --git a/krita/image/tiles3/tests/CMakeLists.txt b/krita/image/tiles3/t=
ests/CMakeLists.txt
index a2e9e82..8941f3b 100644
--- a/krita/image/tiles3/tests/CMakeLists.txt
+++ b/krita/image/tiles3/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${KOGUIUTILS_INCLUDES} )
+include_directories( ${KOGUIUTILS_INCLUDES} )
=
macro_add_unittest_definitions()
=
diff --git a/krita/libbrush/tests/CMakeLists.txt b/krita/libbrush/tests/CMa=
keLists.txt
index 041ec5b..2a6aaab 100644
--- a/krita/libbrush/tests/CMakeLists.txt
+++ b/krita/libbrush/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
########### next target ###############
=
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/image/m=
etadata ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
+include_directories( ${CMAKE_SOURCE_DIR}/krita/image/metadata ${CMAKE_S=
OURCE_DIR}/krita/sdk/tests )
=
macro_add_unittest_definitions()
=
diff --git a/krita/plugins/extensions/gmic/tests/CMakeLists.txt b/krita/plu=
gins/extensions/gmic/tests/CMakeLists.txt
index c943c2f..ae891f8 100644
--- a/krita/plugins/extensions/gmic/tests/CMakeLists.txt
+++ b/krita/plugins/extensions/gmic/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories(${KOMVC_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/sdk/tests =
../)
+include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests ../)
=
macro_add_unittest_definitions()
=
diff --git a/krita/plugins/extensions/resourcemanager/tests/CMakeLists.txt =
b/krita/plugins/extensions/resourcemanager/tests/CMakeLists.txt
index a24b552..f6a284d 100644
--- a/krita/plugins/extensions/resourcemanager/tests/CMakeLists.txt
+++ b/krita/plugins/extensions/resourcemanager/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories(${KOMVC_INCLUDES} =
+include_directories( =
${CMAKE_SOURCE_DIR}/libs/widgets
${CMAKE_SOURCE_DIR}/krita/image
${CMAKE_SOURCE_DIR}/krita/ui
diff --git a/krita/plugins/filters/tests/CMakeLists.txt b/krita/plugins/fil=
ters/tests/CMakeLists.txt
index 0c58b77..b91f96c 100644
--- a/krita/plugins/filters/tests/CMakeLists.txt
+++ b/krita/plugins/filters/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} )
+include_directories( )
=
macro_add_unittest_definitions()
=
diff --git a/krita/plugins/formats/exr/tests/CMakeLists.txt b/krita/plugins=
/formats/exr/tests/CMakeLists.txt
index d3b8985..eee535f 100644
--- a/krita/plugins/formats/exr/tests/CMakeLists.txt
+++ b/krita/plugins/formats/exr/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/sdk/te=
sts )
+include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
=
macro_add_unittest_definitions()
=
diff --git a/krita/plugins/formats/jpeg/tests/CMakeLists.txt b/krita/plugin=
s/formats/jpeg/tests/CMakeLists.txt
index 2636ddc..c240546 100644
--- a/krita/plugins/formats/jpeg/tests/CMakeLists.txt
+++ b/krita/plugins/formats/jpeg/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/sdk/te=
sts )
+include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
=
macro_add_unittest_definitions()
=
diff --git a/krita/plugins/formats/png/tests/CMakeLists.txt b/krita/plugins=
/formats/png/tests/CMakeLists.txt
index 1ab0d0c..5193e6f 100644
--- a/krita/plugins/formats/png/tests/CMakeLists.txt
+++ b/krita/plugins/formats/png/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/sdk/te=
sts )
+include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
=
macro_add_unittest_definitions()
=
diff --git a/krita/plugins/formats/ppm/tests/CMakeLists.txt b/krita/plugins=
/formats/ppm/tests/CMakeLists.txt
index 8cc6a35..4f1d7b5 100644
--- a/krita/plugins/formats/ppm/tests/CMakeLists.txt
+++ b/krita/plugins/formats/ppm/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/sdk/te=
sts )
+include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
=
macro_add_unittest_definitions()
=
diff --git a/krita/plugins/formats/psd/tests/CMakeLists.txt b/krita/plugins=
/formats/psd/tests/CMakeLists.txt
index dc63a630..9957e8b 100644
--- a/krita/plugins/formats/psd/tests/CMakeLists.txt
+++ b/krita/plugins/formats/psd/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${CMAKE_SOURCE_DIR}/.. ${KOMVC_INCLUDES} ${CMAKE_SO=
URCE_DIR}/krita/sdk/tests )
+include_directories( ${CMAKE_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/krita/s=
dk/tests )
=
macro_add_unittest_definitions()
=
diff --git a/krita/plugins/formats/tiff/tests/CMakeLists.txt b/krita/plugin=
s/formats/tiff/tests/CMakeLists.txt
index 1dd4aeb..ea06fb0 100644
--- a/krita/plugins/formats/tiff/tests/CMakeLists.txt
+++ b/krita/plugins/formats/tiff/tests/CMakeLists.txt
@@ -3,7 +3,7 @@ if(LCMS2_FOUND)
endif(LCMS2_FOUND)
=
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/sdk/te=
sts )
+include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
=
macro_add_unittest_definitions()
=
diff --git a/krita/plugins/formats/xcf/tests/CMakeLists.txt b/krita/plugins=
/formats/xcf/tests/CMakeLists.txt
index 9d93b69..32bec0e 100644
--- a/krita/plugins/formats/xcf/tests/CMakeLists.txt
+++ b/krita/plugins/formats/xcf/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/sdk/te=
sts )
+include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
=
macro_add_unittest_definitions()
=
diff --git a/krita/plugins/paintops/defaultpaintops/brush/tests/CMakeLists.=
txt b/krita/plugins/paintops/defaultpaintops/brush/tests/CMakeLists.txt
index abdbb94..4e76d4a 100644
--- a/krita/plugins/paintops/defaultpaintops/brush/tests/CMakeLists.txt
+++ b/krita/plugins/paintops/defaultpaintops/brush/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/sdk/te=
sts )
+include_directories( ${CMAKE_SOURCE_DIR}/krita/sdk/tests )
=
macro_add_unittest_definitions()
=
diff --git a/krita/plugins/tools/defaulttools/tests/CMakeLists.txt b/krita/=
plugins/tools/defaulttools/tests/CMakeLists.txt
index a8088d8..229f51e 100644
--- a/krita/plugins/tools/defaulttools/tests/CMakeLists.txt
+++ b/krita/plugins/tools/defaulttools/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${KOMVC_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${=
CMAKE_SOURCE_DIR}/krita/sdk/tests )
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}=
/krita/sdk/tests )
=
macro_add_unittest_definitions()
=
diff --git a/krita/ui/CMakeLists.txt b/krita/ui/CMakeLists.txt
index b78b02c..92c17b7 100644
--- a/krita/ui/CMakeLists.txt
+++ b/krita/ui/CMakeLists.txt
@@ -9,7 +9,7 @@ else (CMAKE_COMPILER_IS_GNUCXX)
endif (CMAKE_COMPILER_IS_GNUCXX)
=
include_directories(
- ${KOMVC_INCLUDES}
+ =
${CMAKE_SOURCE_DIR}/libs/pigment/colorprofiles
${CMAKE_CURRENT_SOURCE_DIR}/flake
${CMAKE_CURRENT_SOURCE_DIR}/pigment/resources
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic