contrib: make: Remove CMake contrib.

Still required, only HandBrake will not build it anymore.

diff --git a/contrib/cmake/module.defs b/contrib/cmake/module.defs
deleted file mode 100644 (file)
index 15c822e..0000000
--- a/contrib/cmake/module.defs
+++ /dev/null
@@ -1,15 +0,0 @@
-$(eval $(call import.MODULE.defs,CMAKE,cmake))
-$(eval $(call import.CONTRIB.defs,CMAKE))
-
-CMAKE.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/cmake-3.9.6.tar.gz
-CMAKE.FETCH.url    += https://cmake.org/files/v3.9/cmake-3.9.6.tar.gz
-CMAKE.FETCH.sha256  = 7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218
-
-CMAKE.CONFIGURE.deps =
-CMAKE.CONFIGURE.shared =
-CMAKE.CONFIGURE.static =
-CMAKE.CONFIGURE.extra = --no-qt-gui
-
-ifeq (darwin,$(BUILD.system))
-    CMAKE.CONFIGURE.extra += --system-curl
-endif

diff --git a/contrib/cmake/module.rules b/contrib/cmake/module.rules
deleted file mode 100644 (file)
index fb046bd..0000000
--- a/contrib/cmake/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,CMAKE))
-$(eval $(call import.CONTRIB.rules,CMAKE))

diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
index 1d6ff38a3be1d4b4491ecf9b5b3031dd448604ce..e3a82c42ceb1111d15ad8726328c6403e40caf19 100644 (file)
--- a/contrib/x265/module.defs
+++ b/contrib/x265/module.defs
@@ -1,4 +1,4 @@
-__deps__ := CMAKE X265_8 X265_10 X265_12
+__deps__ := X265_8 X265_10 X265_12
 $(eval $(call import.MODULE.defs,X265,x265,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,X265))
 

diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs
index 756dfc1d9066331d0543205d68f0e221766949d8..d5088c520037f226dedc0e5ec5aac401a97e5362 100644 (file)
--- a/contrib/x265_10bit/module.defs
+++ b/contrib/x265_10bit/module.defs
@@ -1,4 +1,4 @@
-__deps__ := CMAKE X265_8
+__deps__ := X265_8
 $(eval $(call import.MODULE.defs,X265_10,x265_10,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_10))
 

diff --git a/contrib/x265_12bit/module.defs b/contrib/x265_12bit/module.defs
index d773aa6ac5d4cafb000161f0f287f0170e6167b4..3642c09203571ae4a95ad638b277b45ae6129f36 100644 (file)
--- a/contrib/x265_12bit/module.defs
+++ b/contrib/x265_12bit/module.defs
@@ -1,4 +1,4 @@
-__deps__ := CMAKE X265_8
+__deps__ := X265_8
 $(eval $(call import.MODULE.defs,X265_12,x265_12,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_12))
 

diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs
index 92f0a7ff70caa4aeb305ee78adcaf504ded10e46..4d42a6bcb7a9913ffb0f87e0628943ef540bfcaa 100644 (file)
--- a/contrib/x265_8bit/module.defs
+++ b/contrib/x265_8bit/module.defs
@@ -1,4 +1,4 @@
-__deps__ := CMAKE
+__deps__ := 
 $(eval $(call import.MODULE.defs,X265_8,x265_8,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_8))
 

diff --git a/make/configure.py b/make/configure.py
index 0d9aec183c13dbf320227431d00b0bacdc5a5dd1..abe6abe478cc65150d1f966652e6428f97572b1a 100644 (file)
--- 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 3ac75c8de95acbef7761b7d3dec7c02d3f1f5cb1..216ae27c311f9e82ae570244b55733e5239a2c56 100644 (file)
--- 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