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>
This commit is contained in:
parent
65bea86ae9
commit
d1a4806390
@ -89,7 +89,7 @@ class Formula
|
|||||||
end
|
end
|
||||||
|
|
||||||
def std_cmake_parameters
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -237,10 +237,18 @@ class Formula
|
|||||||
# Standard parameters for CMake builds.
|
# Standard parameters for CMake builds.
|
||||||
# Using Build Type "None" tells cmake to use our CFLAGS,etc. settings.
|
# Using Build Type "None" tells cmake to use our CFLAGS,etc. settings.
|
||||||
# Setting it to Release would ignore our flags.
|
# 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
|
# Note: there isn't a std_autotools variant because autotools is a lot
|
||||||
# less consistent and the standard parameters are more memorable.
|
# less consistent and the standard parameters are more memorable.
|
||||||
def std_cmake_args
|
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
|
end
|
||||||
|
|
||||||
def self.class_s name
|
def self.class_s name
|
||||||
|
Loading…
x
Reference in New Issue
Block a user