summaryrefslogtreecommitdiffstats
path: root/CMakeScripts
diff options
context:
space:
mode:
authorSebastian Wüst <sebi@timewaster.de>2013-10-20 15:32:08 +0000
committerSebastian Wüst <sebi@timewaster.de>2013-10-20 15:32:08 +0000
commit82908f949129e1fcbf62002799ee7b1b77986eed (patch)
treec02098dd7720cdf424f2793ecd3ddac2ea86b969 /CMakeScripts
parentchanged text (diff)
parentFix build errors with clang 3.3 and c++11 enabled. (diff)
downloadinkscape-82908f949129e1fcbf62002799ee7b1b77986eed.tar.gz
inkscape-82908f949129e1fcbf62002799ee7b1b77986eed.zip
merge from trunk
(bzr r12417.1.24)
Diffstat (limited to 'CMakeScripts')
-rw-r--r--CMakeScripts/cmake_consistency_check_config.py17
1 files changed, 7 insertions, 10 deletions
diff --git a/CMakeScripts/cmake_consistency_check_config.py b/CMakeScripts/cmake_consistency_check_config.py
index 4850eb259..3ee6d4449 100644
--- a/CMakeScripts/cmake_consistency_check_config.py
+++ b/CMakeScripts/cmake_consistency_check_config.py
@@ -30,7 +30,6 @@ IGNORE = (
"src/libnr/nr-compose-reference.cpp",
"src/libnr/testnr.cp",
"src/live_effects/lpe-skeleton.cpp",
- "src/sp-skeleton.cpp",
"src/svg/test-stubs.cpp",
"src/ui/dialog/session-player.cpp",
"src/ui/dialog/whiteboard-connect.cpp",
@@ -41,15 +40,13 @@ IGNORE = (
# header files
"share/filters/filters.svg.h",
"share/palettes/palettes.h",
- "src/inkscape/share/palettes/palettes.h",
- "src/inkscape/share/patterns/patterns.svg.h",
- "src/inkscape/src/libcola/cycle_detector.h",
- "src/inkscape/src/libnr/in-svg-plane-test.h",
- "src/inkscape/src/libnr/nr-point-fns-test.h",
- "src/inkscape/src/libnr/nr-translate-test.h",
- "src/inkscape/src/libnr/nr-types-test.h",
- "src/inkscape/src/sp-skeleton.h",
- "src/inkscape/src/svg/test-stubs.h",
+ "share/palettes/palettes.h",
+ "share/patterns/patterns.svg.h",
+ "src/libcola/cycle_detector.h",
+ "src/libnr/in-svg-plane-test.h",
+ "src/libnr/nr-point-fns-test.h",
+ "src/libnr/nr-translate-test.h",
+ "src/svg/test-stubs.h",
# generated files, created by an in-source build
"CMakeFiles/CompilerIdC/CMakeCCompilerId.c",