From 66b2acc8eec54b48060f2a545b46eaaccdfaef3e Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sat, 1 Feb 2014 20:55:50 +0400 Subject: [PATCH 1/2] removed ocl from allmodules list --- modules/java/generator/rst_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/java/generator/rst_parser.py b/modules/java/generator/rst_parser.py index 63f56dbaa..f2363169b 100755 --- a/modules/java/generator/rst_parser.py +++ b/modules/java/generator/rst_parser.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import os, sys, re, string, fnmatch -allmodules = ["core", "flann", "imgproc", "ml", "highgui", "video", "features2d", "calib3d", "objdetect", "legacy", "contrib", "cuda", "androidcamera", "java", "python", "stitching", "ts", "photo", "nonfree", "videostab", "ocl", "softcascade", "superres"] +allmodules = ["core", "flann", "imgproc", "ml", "highgui", "video", "features2d", "calib3d", "objdetect", "legacy", "contrib", "cuda", "androidcamera", "java", "python", "stitching", "ts", "photo", "nonfree", "videostab", "softcascade", "superres"] verbose = False show_warnings = True show_errors = True From f8dd9960af1f5862462caed2d04b11d25488e555 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sat, 1 Feb 2014 21:49:03 +0400 Subject: [PATCH 2/2] one more ocl deletion --- samples/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 1d30f5b8b..36b68d2d1 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -62,7 +62,6 @@ endif() add_subdirectory(c) add_subdirectory(cpp) -add_subdirectory(ocl) # FIXIT: can't use cvconfig.h in samples: add_subdirectory(gpu) if(WIN32)