repaired opencv refman & refman1 build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6b8043..c1886a4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -832,7 +832,7 @@ endif()
 \r
 \r
 ################## Reference Manual ##################\r
-set(BUILD_REFMAN ON CACHE BOOL "Build OpenCV Reference Manual")\r
+set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Reference Manual")\r
 \r
 \r
 ################### DOXYGEN ###############\r
@@ -1284,7 +1284,7 @@ endif()
 add_subdirectory(include)\r
 add_subdirectory(modules)\r
 \r
-if(BUILD_REFMAN)\r
+if(BUILD_DOCS)\r
   include(OpenCVFindLATEX.cmake REQUIRED)\r
 \r
   if(PDFLATEX_COMPILER)\r
@@ -1292,7 +1292,7 @@ if(BUILD_REFMAN)
   endif()\r
 endif()\r
 \r
-add_subdirectory(docroot)\r
+add_subdirectory(doc)\r
 add_subdirectory(data)\r
 \r
 if(BUILD_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)\r
@@ -1482,10 +1482,10 @@ endif()
 message(STATUS "")\r
 message(STATUS "  Documentation: ")\r
 \r
-if(BUILD_REFMAN AND PDFLATEX_COMPILER AND HAVE_SPHINX)\r
-message(STATUS "    Build Reference Manual:     YES")\r
+if(BUILD_DOCS AND PDFLATEX_COMPILER AND HAVE_SPHINX)\r
+message(STATUS "    Build Documentation:        YES")\r
 else()\r
-message(STATUS "    Build Reference Manual:     NO")\r
+message(STATUS "    Build Documentation:        NO")\r
 endif()\r
 \r
 #if(BUILD_DOXYGEN_DOCS AND DOXYGEN_FOUND)\r

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 35e1bf6..b7bc5ed 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB FILES_DOC_VS vidsurv/*.doc)
 file(GLOB FILES_TEX *.tex *.sty *.bib)
 file(GLOB FILES_TEX_PICS pics/*.png pics/*.jpg)
 
-if(BUILD_REFMAN AND PDFLATEX_COMPILER AND HAVE_SPHINX)
+if(BUILD_DOCS AND PDFLATEX_COMPILER AND HAVE_SPHINX)
 
 add_subdirectory(opencv1)
 add_subdirectory(opencv2)

diff --git a/doc/opencv1/CMakeLists.txt b/doc/opencv1/CMakeLists.txt
index a5d2a5f..810398c 100644 (file)
--- a/doc/opencv1/CMakeLists.txt
+++ b/doc/opencv1/CMakeLists.txt
@@ -8,7 +8,7 @@ add_custom_target(refman1
                     -b latex -c ${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_SOURCE_DIR} .
                   COMMAND ${CMAKE_COMMAND} -E copy_directory
-                    ${CMAKE_CURRENT_SOURCE_DIR}/pics ${CMAKE_CURRENT_BINARY_DIR}/pics
+                    ${CMAKE_CURRENT_SOURCE_DIR}/../pics ${CMAKE_CURRENT_BINARY_DIR}/pics
                   COMMAND ${CMAKE_COMMAND} -E copy
                     ${CMAKE_CURRENT_SOURCE_DIR}/../mymath.sty ${CMAKE_CURRENT_BINARY_DIR}
                   COMMAND ${PDFLATEX_COMPILER} opencv1x

diff --git a/doc/pics/Qt_GUI.png b/doc/pics/qtgui.png
similarity index 100%
rename from doc/pics/Qt_GUI.png
rename to doc/pics/qtgui.png