From 91af4aa0fec338c7938956334921d3ef89934fea Mon Sep 17 00:00:00 2001
From: Dominyk Tiller <dominyktiller@gmail.com>
Date: Fri, 15 Jul 2016 05:22:04 +0100
Subject: [PATCH] super: migrate xml2 cmake to mac/super
Looks like it was accidentally left behind (?)
---
Library/Homebrew/extend/ENV/super.rb | 1 -
Library/Homebrew/extend/os/mac/extend/ENV/super.rb | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index 173bd5fde4..63522022e0 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -200,7 +200,6 @@ module Superenv
def determine_cmake_include_path
paths = []
- paths << "#{effective_sysroot}/usr/include/libxml2" unless deps.any? { |d| d.name == "libxml2" }
paths += homebrew_extra_cmake_include_paths
paths.to_path_s
end
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
index 9e0a251370..77625f455a 100644
--- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
@@ -55,6 +55,7 @@ module Superenv
def homebrew_extra_cmake_include_paths
paths = []
+ paths << "#{effective_sysroot}/usr/include/libxml2" unless deps.any? { |d| d.name == "libxml2" }
paths << "#{effective_sysroot}/usr/include/apache2" if MacOS::Xcode.without_clt?
paths << MacOS::X11.include.to_s << "#{MacOS::X11.include}/freetype2" if x11?
paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers"
--
GitLab