Skip to content

Commit 7d7d9e4

Browse files
committed
add opencl and opencl_svm support
1 parent 4dbbe5f commit 7d7d9e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+123
-111
lines changed

CMakeCache-armeabi-v7a.txt

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ANDROID_EXAMPLES_WITH_LIBS:BOOL=OFF
2525
ANDROID_EXECUTABLE:FILEPATH=D:/ProgramData/Android/SDK/tools/android.bat
2626

2727
//Prevent cmake from working under cygwin and using cygwin tools
28-
ANDROID_FORBID_SYGWIN:BOOL=TRUE
28+
ANDROID_FORBID_SYGWIN:BOOL=ON
2929

3030
//Use 32-bit ARM instructions instead of Thumb-1
3131
ANDROID_FORCE_ARM_BUILD:BOOL=OFF
@@ -41,7 +41,7 @@ ANDROID_GOLD_LINKER:BOOL=ON
4141
ANDROID_NATIVE_API_LEVEL:STRING=21
4242

4343
//Try to use 64-bit compiler toolchain
44-
ANDROID_NDK_HOST_X64:BOOL=1
44+
ANDROID_NDK_HOST_X64:BOOL=ON
4545

4646
//The inner layout of NDK
4747
ANDROID_NDK_LAYOUT:STRING=
@@ -52,14 +52,11 @@ ANDROID_NOEXECSTACK:BOOL=ON
5252
//Show all undefined symbols as linker errors
5353
ANDROID_NO_UNDEFINED:BOOL=ON
5454

55-
//No help, variable specified on the command line.
56-
ANDROID_PLATFORM_ID:UNINITIALIZED=2
57-
5855
//Enables RELRO - a memory corruption mitigation technique
5956
ANDROID_RELRO:BOOL=ON
6057

61-
//No help, variable specified on the command line.
62-
ANDROID_SDK_TARGET:UNINITIALIZED=23
58+
//Android SDK target for the OpenCV Java API and samples
59+
ANDROID_SDK_TARGET:STRING=android-23
6360

6461
//Allows or disallows undefined symbols in shared libraries
6562
ANDROID_SO_UNDEFINED:BOOL=ON
@@ -71,9 +68,6 @@ ANDROID_STL:STRING=gnustl_static
7168
// C++ runtime
7269
ANDROID_STL_FORCE_FEATURES:BOOL=ON
7370

74-
//No help, variable specified on the command line.
75-
ANDROID_TOOLCHAIN_NAME:UNINITIALIZED=arm-linux-androideabi-4.9
76-
7771
//Path to a program.
7872
ANT_EXECUTABLE:FILEPATH=D:/ProgramData/apache-ant-1.10.2/bin/ant.bat
7973

@@ -458,10 +452,10 @@ CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
458452

459453
//If set, runtime paths are not added when installing shared libraries,
460454
// but are added when building.
461-
CMAKE_SKIP_INSTALL_RPATH:BOOL=NO
455+
CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF
462456

463457
//If set, runtime paths are not added when using shared libraries.
464-
CMAKE_SKIP_RPATH:BOOL=TRUE
458+
CMAKE_SKIP_RPATH:BOOL=ON
465459

466460
//Flags used by the linker during the creation of static libraries
467461
// during all build types.
@@ -486,14 +480,11 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING=
486480
//strip
487481
CMAKE_STRIP:PATH=D:/ProgramData/Android/SDK/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/arm-linux-androideabi-strip.exe
488482

489-
//No help, variable specified on the command line.
490-
CMAKE_TOOLCHAIN_FILE:UNINITIALIZED=D:\ProgramData\opencv341-android-sdk-with-contrib\opencv\sources\platforms\android\android.toolchain.cmake
491-
492483
//If this value is on, makefiles will be generated without the
493484
// .SILENT directive, and all commands will be echoed to the console
494485
// during the make. This is useful for debugging only. With Visual
495486
// Studio IDE projects all commands are done without /nologo.
496-
CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
487+
CMAKE_VERBOSE_MAKEFILE:BOOL=OFF
497488

498489
//Enable to build Debian packages
499490
CPACK_BINARY_DEB:BOOL=OFF
@@ -547,7 +538,7 @@ CPACK_SOURCE_ZIP:BOOL=OFF
547538
CPUFEATURES_ROOT:PATH=D:/ProgramData/opencv341-android-sdk-with-contrib/opencv/sources/3rdparty/cpufeatures
548539

549540
//Specify list of enabled baseline CPU optimizations
550-
CPU_BASELINE:STRING=DETECT
541+
CPU_BASELINE:STRING=
551542

552543
//Specify list of forbidden baseline CPU optimizations
553544
CPU_BASELINE_DISABLE:STRING=;VFPV3;NEON
@@ -684,12 +675,18 @@ LIBRARY_OUTPUT_PATH_ROOT:PATH=D:/ProgramData/opencv341-android-sdk-with-contrib/
684675
//Path to a library.
685676
M_LIBRARY:FILEPATH=D:/ProgramData/Android/SDK/ndk-bundle/platforms/android-21/arch-arm/usr/lib/libm.so
686677

687-
//The path to ccache binary
688-
NDK_CCACHE:FILEPATH=NDK_CCACHE-NOTFOUND
689-
690678
//The directory containing a CMake configuration file for OGRE.
691679
OGRE_DIR:PATH=OGRE_DIR-NOTFOUND
692680

681+
//OpenCL library is found
682+
OPENCL_FOUND:BOOL=ON
683+
684+
//OpenCL include directory
685+
OPENCL_INCLUDE_DIR:PATH=D:/ProgramData/opencv341-android-sdk-with-contrib/opencv/sources/3rdparty/include/opencl/1.2
686+
687+
//OpenCL library
688+
OPENCL_LIBRARY:STRING=
689+
693690
//Where to create the platform-dependant cvconfig.h
694691
OPENCV_CONFIG_FILE_INCLUDE_DIR:PATH=D:/ProgramData/opencv341-android-sdk-with-contrib/opencv/build
695692

@@ -773,7 +770,7 @@ TBB_VER_FILE:FILEPATH=D:/ProgramData/opencv341-android-sdk-with-contrib/opencv/b
773770
TINYDNN_INCLUDE_DIR:PATH=TINYDNN_INCLUDE_DIR-NOTFOUND
774771

775772
//Use win32 IO system (Microsoft Windows only)
776-
USE_WIN32_FILEIO:BOOL=FALSE
773+
USE_WIN32_FILEIO:BOOL=OFF
777774

778775
//Use NVidia carotene acceleration library for ARM platform
779776
WITH_CAROTENE:BOOL=ON
@@ -819,10 +816,10 @@ WITH_JPEG:BOOL=ON
819816
WITH_NVCUVID:BOOL=ON
820817

821818
//Include OpenCL Runtime support
822-
WITH_OPENCL:BOOL=OFF
819+
WITH_OPENCL:BOOL=ON
823820

824821
//Include OpenCL Shared Virtual Memory support
825-
WITH_OPENCL_SVM:BOOL=OFF
822+
WITH_OPENCL_SVM:BOOL=ON
826823

827824
//Include ILM support via OpenEXR
828825
WITH_OPENEXR:BOOL=ON
@@ -2163,6 +2160,10 @@ OCV_DOWNLOAD_XFEATURES2D_VGG_HASH_downloads_xfeatures2d_vgg_generated_120_i:INTE
21632160
OCV_DOWNLOAD_XFEATURES2D_VGG_HASH_downloads_xfeatures2d_vgg_generated_48_i:INTERNAL=e8d0dcd54d1bcfdc29203d011a797179
21642161
OCV_DOWNLOAD_XFEATURES2D_VGG_HASH_downloads_xfeatures2d_vgg_generated_64_i:INTERNAL=7126a5d9a8884ebca5aea5d63d677225
21652162
OCV_DOWNLOAD_XFEATURES2D_VGG_HASH_downloads_xfeatures2d_vgg_generated_80_i:INTERNAL=7cd47228edec52b6d82f46511af325c5
2163+
//ADVANCED property for variable: OPENCL_INCLUDE_DIR
2164+
OPENCL_INCLUDE_DIR-ADVANCED:INTERNAL=1
2165+
//ADVANCED property for variable: OPENCL_LIBRARY
2166+
OPENCL_LIBRARY-ADVANCED:INTERNAL=1
21662167
OPENCV_ANDROID_LIB_DIR:INTERNAL=D:/ProgramData/opencv341-android-sdk-with-contrib/opencv/build/android_sdk
21672168
OPENCV_DEPHELPER:INTERNAL=D:/ProgramData/opencv341-android-sdk-with-contrib/opencv/build/CMakeFiles/dephelper
21682169
OPENCV_JAVA_BINDINGS_DIR:INTERNAL=D:/ProgramData/opencv341-android-sdk-with-contrib/opencv/build/modules/java_bindings_generator
@@ -3771,6 +3772,8 @@ ZLIB_INCLUDE_DIR-ADVANCED:INTERNAL=1
37713772
ZLIB_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
37723773
//ADVANCED property for variable: ZLIB_LIBRARY_RELEASE
37733774
ZLIB_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
3775+
//Result of TRY_COMPILE
3776+
__VALID_OPENCL:INTERNAL=FALSE
37743777
//Result of TEST_BIG_ENDIAN
37753778
bigendian:INTERNAL=0
37763779
//CHECK_TYPE_SIZE: INT16 unknown

0 commit comments

Comments
 (0)