From 333371dd8c5c7d55cae3e91a79caabb61167515f Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Wed, 22 Jun 2011 08:38:26 +0000 Subject: [PATCH] be able to build docs without building python bindings (ticket #1157) --- CMakeLists.txt | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d343b8654..06be5e31bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -564,6 +564,12 @@ if(WITH_OPENEXR) include(OpenCVFindOpenEXR.cmake) endif() +set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Documentation") + +if(BUILD_DOCS) + include(OpenCVFindLATEX.cmake REQUIRED) +endif() + set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support") if (WIN32) @@ -572,7 +578,7 @@ if (WIN32) endif() endif() -if(BUILD_NEW_PYTHON_SUPPORT) +if(BUILD_NEW_PYTHON_SUPPORT OR BUILD_DOCS) find_package(PythonInterp) find_package(PythonLibs) @@ -610,7 +616,7 @@ if(BUILD_NEW_PYTHON_SUPPORT) set(PYTHON_USE_NUMPY 1) add_definitions(-D PYTHON_USE_NUMPY=1) include_directories(AFTER ${PYTHON_NUMPY_INCLUDE_DIRS}) - message(STATUS " Use INCLUDE: ${PYTHON_NUMPY_INCLUDE_DIRS}") + message(STATUS " Use NumPy headers from: ${PYTHON_NUMPY_INCLUDE_DIRS}") else() set(PYTHON_USE_NUMPY 0) endif() @@ -884,9 +890,6 @@ libnative_camera_rx.x.x.so for your Android") endif() endif() -################## Reference Manual ################## -set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Reference Manual") - ################### DOXYGEN ############### @@ -1394,15 +1397,6 @@ endif() #----------------------------------- add_subdirectory(include) add_subdirectory(modules) - -if(BUILD_DOCS) - include(OpenCVFindLATEX.cmake REQUIRED) - - if(PDFLATEX_COMPILER) - message(STATUS "PDF LaTeX found!") - endif() -endif() - add_subdirectory(doc) add_subdirectory(data)