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

clean up X11 conditionals

Browse Source
This commit is contained in:
Jack Nagel 2014-05-12 11:45:50 -05:00
parent 38765ae9fd
commit ff9191eca2
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,17 +176,22 @@ module Superenv
paths = [] paths = []
paths << "#{sdk}/usr/include/libxml2" unless deps.include? 'libxml2' paths << "#{sdk}/usr/include/libxml2" unless deps.include? 'libxml2'
paths << "#{sdk}/usr/include/apache2" if MacOS::Xcode.without_clt? paths << "#{sdk}/usr/include/apache2" if MacOS::Xcode.without_clt?
paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers" unless x11? if x11?
paths << MacOS::X11.include << "#{MacOS::X11.include}/freetype2" if x11? paths << MacOS::X11.include << "#{MacOS::X11.include}/freetype2"
else
paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers"
end
paths.to_path_s paths.to_path_s
end end
def determine_cmake_library_path def determine_cmake_library_path
sdk = MacOS.sdk_path if MacOS::Xcode.without_clt? sdk = MacOS.sdk_path if MacOS::Xcode.without_clt?
paths = [] paths = []
# things expect to find GL headers since X11 used to be a default, so we add them if x11?
paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" unless x11? paths << MacOS::X11.lib
paths << MacOS::X11.lib if x11? else
paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"
end
paths.to_path_s paths.to_path_s
end end