summaryrefslogtreecommitdiffstats
path: root/CMakeScripts
diff options
context:
space:
mode:
authorkamalpreetgrewal <grewalkamal005@gmail.com>2016-06-06 16:23:12 +0000
committerkamalpreetgrewal <grewalkamal005@gmail.com>2016-06-06 16:23:12 +0000
commit782b586b9fd93b05e3dbc960ccd006014d32c5ac (patch)
treeac7a0304cd3224731235fd2b688f12d04f1501e6 /CMakeScripts
parentRegister style dialog with support to add selector (diff)
parent[Bug #1588983] Finish up German tutorials for 0.92. (diff)
downloadinkscape-782b586b9fd93b05e3dbc960ccd006014d32c5ac.tar.gz
inkscape-782b586b9fd93b05e3dbc960ccd006014d32c5ac.zip
Merging changes from trunk
(bzr r14949.1.2)
Diffstat (limited to 'CMakeScripts')
-rw-r--r--CMakeScripts/DefineDependsandFlags.cmake12
1 files changed, 12 insertions, 0 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index f2a6b5670..0f4ba46c6 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -262,6 +262,18 @@ if(WITH_DBUS)
endif()
endif()
+if(WITH_SVG2)
+ add_definitions(-DWITH_MESH -DWITH_CSSBLEND -DWITH_CSSCOMPOSITE -DWITH_SVG2)
+else()
+ add_definitions(-UWITH_MESH -UWITH_CSSBLEND -UWITH_CSSCOMPOSITE -UWITH_SVG2)
+endif()
+
+if(WITH_LPETOOL)
+ add_definitions(-DWITH_LPETOOL -DLPE_ENABLE_TEST_EFFECTS)
+else()
+ add_definitions(-UWITH_LPETOOL -ULPE_ENABLE_TEST_EFFECTS)
+endif()
+
if(WITH_GTEST)
if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}")