From a426369977502e3b3245d8341b71593c368bc2e3 Mon Sep 17 00:00:00 2001
From: Bradley Sepos <bradley@bradleysepos.com>
Date: Sun, 10 Jun 2018 22:04:02 -0400
Subject: contrib: make: Remove CMake contrib.

Still required, only HandBrake will not build it anymore.
---
 make/configure.py      | 11 +----------
 make/include/main.defs | 10 ----------
 2 files changed, 1 insertion(+), 20 deletions(-)

(limited to 'make')

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
-- 
cgit v1.2.3