From fec6b1b18c55d40409dec7b2504c9ec111a45295 Mon Sep 17 00:00:00 2001
From: suv-lp <>
Date: Sun, 5 Jun 2016 09:15:29 +0200
Subject: [Bug #1545333] Convenience option (default: ON) for cmake builds to
 enable SVG2 and experimental LPEs

Fixed bugs:
  - https://launchpad.net/bugs/1545333

(bzr r14954)
---
 CMakeScripts/DefineDependsandFlags.cmake | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'CMakeScripts')

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}")
 	
-- 
cgit v1.2.3


From c8fb84faf249ce3f7d7bc8837fd47c16813f09d3 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 9 Jun 2016 10:03:26 +0100
Subject: Fix testing dependencies

(bzr r14967.1.2)
---
 CMakeScripts/DefineDependsandFlags.cmake | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 0f4ba46c6..706860a00 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -274,14 +274,6 @@ else()
 	add_definitions(-UWITH_LPETOOL -ULPE_ENABLE_TEST_EFFECTS)
 endif()
 
-if(WITH_GTEST)
-    if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}")
-	
-    else()
-	set(WITH_GTEST off)
-    endif()
-endif()
-
 # ----------------------------------------------------------------------------
 # CMake's builtin
 # ----------------------------------------------------------------------------
-- 
cgit v1.2.3