Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts

This commit is contained in:
Andrey Kamaev
2012-02-06 11:30:59 +00:00
parent 863fe3ecf8
commit 23af203e00
12 changed files with 84 additions and 99 deletions

View File

@@ -1,7 +1,7 @@
# ----------------------------------------------------------------------------
# CMake file for java support
# ----------------------------------------------------------------------------
if(NOT BUILD_JAVA_SUPPORT OR NOT PYTHON_EXECUTABLE)
if(NOT PYTHON_EXECUTABLE)
ocv_module_disable(java)
endif()