YAML CPP: Fix detection of yaml-cpp on macOS 10.13

ElektraInitiative · Oct 6, 2017 · 3e2ce88 · 3e2ce88
1 parent 64ec38d
commit 3e2ce88
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/cmake/Modules/Findyaml-cpp.cmake b/cmake/Modules/Findyaml-cpp.cmake
@@ -14,7 +14,7 @@ find_package(PkgConfig)
 pkg_check_modules(PC_YAML-CPP QUIET yaml-cpp)
 
 find_path(YAML-CPP_INCLUDE_DIR
-	yaml.h
+	NAMES yaml-cpp/yaml.h
 	HINTS ${PC_YAML-CPP_INCLUDEDIR} ${PC_YAML-CPP_INCLUDE_DIRS}
 	PATH_SUFFIXES yaml-cpp)
 

diff --git a/src/plugins/yamlcpp/CMakeLists.txt b/src/plugins/yamlcpp/CMakeLists.txt
@@ -19,7 +19,7 @@ add_plugin (yamlcpp
 		read.hpp read.cpp
 		write.hpp write.cpp
 	INCLUDE_DIRECTORIES
-		${YAML-CPP_INCLUDE_DIR}
+		${YAML-CPP_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
 	LINK_LIBRARIES
 		${YAML-CPP_LIBRARIES}
 	LINK_ELEKTRA

diff --git a/src/plugins/yamlcpp/read.cpp b/src/plugins/yamlcpp/read.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "read.hpp"
-#include "yaml.h"
+#include "yaml-cpp/yaml.h"
 
 #include <kdb.hpp>
 #include <kdbease.h>

diff --git a/src/plugins/yamlcpp/write.cpp b/src/plugins/yamlcpp/write.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "write.hpp"
-#include "yaml.h"
+#include "yaml-cpp/yaml.h"
 
 #include <kdbease.h>
 #include <kdblogger.h>

diff --git a/src/plugins/yamlcpp/yamlcpp.cpp b/src/plugins/yamlcpp/yamlcpp.cpp
@@ -19,7 +19,7 @@ using namespace ckdb;
 #include <kdberrors.h>
 #include <kdblogger.h>
 
-#include "yaml.h"
+#include "yaml-cpp/yaml.h"
 
 // -- Functions ----------------------------------------------------------------------------------------------------------------------------