mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-27 20:50:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Main CMakeLists.txt merged with 2.3 branch

Browse Source
This commit is contained in:
Andrey Kamaev 2011-06-22 11:53:15 +00:00
parent 76bc9f8c20
commit 9600ebadf2
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
CMakeLists.txt
View File

@ -90,7 +90,7 @@ endif()
# ----------------------------------------------------------------------------
# Current version number:
# ----------------------------------------------------------------------------
set(OPENCV_VERSION "2.2.9")
set(OPENCV_VERSION "2.3.0")
string(REGEX MATCHALL "[0-9]" OPENCV_VERSION_PARTS "${OPENCV_VERSION}")
@ -577,8 +577,12 @@ if(WITH_OPENEXR)
include(OpenCVFindOpenEXR.cmake)
endif()
# Python support
# ===================================================
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)
@ -629,7 +633,7 @@ if(PYTHON_NUMPY_PROCESS EQUAL 0)
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()
@ -648,6 +652,7 @@ if(SPHINX_PROCESS EQUAL 0)
endif()
endif()
#YV
############################### QT ################################
@ -902,9 +907,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 ###############
@ -1379,11 +1381,17 @@ if(BUILD_PACKAGE)
endif()
install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE)
install(DIRECTORY 3rdparty android modules tests doc DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
install(DIRECTORY 3rdparty android modules doc DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
#install(DIRECTORY doc DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.rst" "*.tex")
#install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
#install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
# install TBB dlls
if(WIN32 AND HAVE_TBB)
string(REGEX REPLACE "/lib" "/bin" TBB_DLL_DIR "${TBB_LIB_DIR}")
install(PROGRAMS "${TBB_DLL_DIR}/tbb.dll" DESTINATION bin COMPONENT main)
install(PROGRAMS "${TBB_DLL_DIR}/tbb_debug.dll" DESTINATION bin COMPONENT main)
endif()
endif()
endif()
@ -1406,15 +1414,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)
@ -1422,11 +1421,6 @@ if(BUILD_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
add_subdirectory(samples)
endif()
#if(BUILD_TESTS)
# enable_testing()
# add_subdirectory(tests)
#endif()
add_subdirectory(3rdparty)