diff options
| author | Charlie Sharpsteen | 2012-05-29 16:58:32 -0700 |
|---|---|---|
| committer | Charlie Sharpsteen | 2012-06-03 10:03:56 -0700 |
| commit | d1a48063906ed63cbdf1f014b6090cbbdcfedd97 (patch) | |
| tree | f0ae5ad2debaeaaf4f89eb38930edfae2d571779 /Library | |
| parent | 65bea86ae9df1b58d88ad32e7338b1d1c8ca4e0e (diff) | |
| download | brew-d1a48063906ed63cbdf1f014b6090cbbdcfedd97.tar.bz2 | |
std_cmake_args: Search for Frameworks last
Most Homebrew builds produce libraries, so CMake should give priority to
libraries when resolving dependencies.
Closes Homebrew/homebrew#12497.
Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/compat/compatibility.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula.rb | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Library/Homebrew/compat/compatibility.rb b/Library/Homebrew/compat/compatibility.rb index 1dcb52cb4..45222cf82 100644 --- a/Library/Homebrew/compat/compatibility.rb +++ b/Library/Homebrew/compat/compatibility.rb @@ -89,7 +89,7 @@ class Formula end def std_cmake_parameters - "-DCMAKE_INSTALL_PREFIX='#{prefix}' -DCMAKE_BUILD_TYPE=None -Wno-dev" + "-DCMAKE_INSTALL_PREFIX='#{prefix}' -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -Wno-dev" end end diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 04e6e2df1..541ee65d8 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -237,10 +237,18 @@ class Formula # Standard parameters for CMake builds. # Using Build Type "None" tells cmake to use our CFLAGS,etc. settings. # Setting it to Release would ignore our flags. + # Setting CMAKE_FIND_FRAMEWORK to "LAST" tells CMake to search for our + # libraries before trying to utilize Frameworks, many of which will be from + # 3rd party installs. # Note: there isn't a std_autotools variant because autotools is a lot # less consistent and the standard parameters are more memorable. def std_cmake_args - %W[-DCMAKE_INSTALL_PREFIX=#{prefix} -DCMAKE_BUILD_TYPE=None -Wno-dev] + %W[ + -DCMAKE_INSTALL_PREFIX=#{prefix} + -DCMAKE_BUILD_TYPE=None + -DCMAKE_FIND_FRAMEWORK=LAST + -Wno-dev + ] end def self.class_s name |
