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

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

No files matched your search

+1 -1
View File
@@ -5,7 +5,7 @@
if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
ocv_module_disable(python)
endif()
if(NOT PYTHONLIBS_FOUND OR NOT BUILD_NEW_PYTHON_SUPPORT OR NOT PYTHON_USE_NUMPY)
if(ANDROID OR IOS OR NOT PYTHONLIBS_FOUND OR NOT PYTHON_USE_NUMPY)
ocv_module_disable(python)
endif()