diff options
author | jstebbins <[email protected]> | 2014-08-20 17:44:07 +0000 |
---|---|---|
committer | jstebbins <[email protected]> | 2014-08-20 17:44:07 +0000 |
commit | 3b8a7e1aec5711748720aa8c029f572e07131801 (patch) | |
tree | 65450df1421e9344269738f7a12865974d884351 /make/configure.py | |
parent | 46d2237fcf5a6babfd555f647fd15312a8de9ab1 (diff) |
build: add cmake contrib for building x265 on osx
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6328 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make/configure.py')
-rw-r--r-- | make/configure.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/make/configure.py b/make/configure.py index 571093e24..89a1edec6 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1248,6 +1248,8 @@ def createCLI(): grp.add_option( '--enable-local-yasm', default=False, action='store_true', help=h ) h = IfHost( 'Build and use local autotools', '*-*-*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--enable-local-autotools', default=False, action='store_true', help=h ) + h = IfHost( 'Build and use local cmake', '*-*-*', none=optparse.SUPPRESS_HELP ).value + grp.add_option( '--enable-local-cmake', default=False, action='store_true', help=h ) h = IfHost( 'Build and use local pkg-config', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--enable-local-pkgconfig', default=False, action='store_true', help=h ) @@ -1419,6 +1421,7 @@ try: yasm = ToolProbe( 'YASM.exe', 'yasm', abort=False, minversion=[1,2,0] ) autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=False ) automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=False ) + cmake = ToolProbe( 'CMAKE.exe', 'cmake', abort=False ) libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', abort=False ) pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkg-config', abort=False ) @@ -1492,6 +1495,11 @@ try: stdout.write( 'note: enabling local autotools\n' ) options.enable_local_autotools = True + ## enable local cmake when cmake probe fails + if not options.enable_local_cmake and (Tools.cmake.fail): + stdout.write( 'note: enabling local cmake\n' ) + options.enable_local_cmake = True + ## enable local pkg-config when probe fails if not options.enable_local_pkgconfig and Tools.pkgconfig.fail: stdout.write( 'note: enabling local pkgconfig\n' ) @@ -1660,6 +1668,7 @@ int main () doc.addBlank() doc.add( 'FEATURE.local_yasm', int( options.enable_local_yasm )) doc.add( 'FEATURE.local_autotools', int( options.enable_local_autotools )) + doc.add( 'FEATURE.local_cmake', int( options.enable_local_cmake )) doc.add( 'FEATURE.local_pkgconfig', int( options.enable_local_pkgconfig )) doc.add( 'FEATURE.asm', 'disabled' ) doc.add( 'FEATURE.gtk', int( not options.disable_gtk )) |