From a4f1a2d26cf54429a4b887ad13077896a08fe188 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Tue, 20 Mar 2018 17:41:06 +0100
Subject: make yaml optional even if present

---
 CMakeScripts/DefineDependsandFlags.cmake | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 05de34db4..59407ec21 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -377,15 +377,17 @@ list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS})
 
 list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER})
 
-find_package(yaml)
-if(YAML_FOUND)
-    set (WITH_YAML ON)
-    list(APPEND INKSCAPE_INCS_SYS ${YAML_INCLUDE_DIRS})
-    list(APPEND INKSCAPE_LIBS ${YAML_LIBRARIES})
-    add_definitions(-DWITH_YAML)
-else(YAML_FOUND)
-    set(WITH_YAML OFF)
-    message(STATUS "Could not locate the yaml library headers: xverb feature will be disabled")
+if(WITH_YAML)
+    find_package(yaml)
+    if(YAML_FOUND)
+        set (WITH_YAML ON)
+        list(APPEND INKSCAPE_INCS_SYS ${YAML_INCLUDE_DIRS})
+        list(APPEND INKSCAPE_LIBS ${YAML_LIBRARIES})
+        add_definitions(-DWITH_YAML)
+    else(YAML_FOUND)
+        set(WITH_YAML OFF)
+        message(STATUS "Could not locate the yaml library headers: xverb feature will be disabled")
+    endif()
 endif()
 
 list(REMOVE_DUPLICATES INKSCAPE_CXX_FLAGS)
-- 
cgit v1.2.3