admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Combine X11 path conditionals

Browse Source
This commit is contained in:
Jack Nagel 2013-11-15 21:25:43 -06:00
parent 76b69a8eb4
commit b1f8358fa8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/extend/ENV/super.rb
View File

@ -182,11 +182,10 @@ module Superenv
def determine_cmake_include_path
sdk = MacOS.sdk_path if MacOS::Xcode.without_clt?
paths = []
paths << "#{MacOS::X11.include}/freetype2" if x11?
paths << "#{sdk}/usr/include/libxml2" unless deps.include? 'libxml2'
paths << "#{sdk}/usr/include/apache2" if MacOS::Xcode.without_clt?
paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers" unless x11?
paths << MacOS::X11.include if x11?
paths << MacOS::X11.include << "#{MacOS::X11.include}/freetype2" if x11?
paths.to_path_s
end