diff options
| author | Bradley Sepos <[email protected]> | 2018-06-10 22:04:02 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-06-17 00:23:34 -0400 |
| commit | a426369977502e3b3245d8341b71593c368bc2e3 (patch) | |
| tree | c99f64867d5d8d450ba827a043a7b6b88adeafbc /make | |
| parent | 517ed0030f340d3b8f3f2aee1cbac23f5e9da30a (diff) | |
contrib: make: Remove CMake contrib.
Still required, only HandBrake will not build it anymore.
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.py | 11 | ||||
| -rw-r--r-- | make/include/main.defs | 10 |
2 files changed, 1 insertions, 20 deletions
diff --git a/make/configure.py b/make/configure.py index 0d9aec183..abe6abe47 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1343,9 +1343,6 @@ def createCLI(): h = IfHost( 'specify Mac OS X deployment target for Xcode builds', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--minver', default=None, action='store', metavar='VER', 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 ) cli.add_option_group( grp ) ## add Xcode options @@ -1528,7 +1525,7 @@ try: nasm = ToolProbe( 'NASM.exe', 'nasm', abort=False, minversion=[2,13,0] ) autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=True ) automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=True ) - cmake = ToolProbe( 'CMAKE.exe', 'cmake', abort=False ) + cmake = ToolProbe( 'CMAKE.exe', 'cmake', abort=True ) libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', abort=True ) pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkg-config', abort=True ) @@ -1592,11 +1589,6 @@ try: elif Tools.nasm.version.inadequate(): raise AbortError( 'error: minimum required nasm version is %s and %s is %s\n' % ('.'.join([str(i) for i in Tools.nasm.version.minversion]),Tools.nasm.pathname,Tools.nasm.version.svers) ) - ## 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 - if build.system == 'mingw': dlfcn_test = """ #include <dlfcn.h> @@ -1841,7 +1833,6 @@ int main() doc.add( 'PREFIX/', cfg.prefix_final + os.sep ) doc.addBlank() - doc.add( 'FEATURE.local_cmake', int( options.enable_local_cmake )) doc.add( 'FEATURE.asm', 'disabled' ) doc.add( 'FEATURE.flatpak', int( options.flatpak )) doc.add( 'FEATURE.gtk', int( not options.disable_gtk )) diff --git a/make/include/main.defs b/make/include/main.defs index 3ac75c8de..216ae27c3 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -7,16 +7,6 @@ include $(SRC/)make/include/tool.defs ############################################################################### -HB_TOOLS_PATH = -ifeq (1,$(FEATURE.local_cmake)) - MODULES += contrib/cmake - HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin) -endif - -ifneq (,$(HB_TOOLS_PATH)) - PATH := $(HB_TOOLS_PATH):$(PATH) -endif - ifneq (,$(filter $(BUILD.system),cygwin mingw)) ifneq ($(HAS.bz2),1) MODULES += contrib/bzip2 |