generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added fixes to CMakeLists.txt

Browse Source
This commit is contained in:
hbristow 2013-09-13 17:22:12 +10:00
parent 74accbd969
commit 530ad447bc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -43,6 +43,7 @@ if(DEFINED CMAKE_BUILD_TYPE)
endif()
project(OpenCV CXX C)
include(cmake/OpenCVUtils.cmake)
# ----------------------------------------------------------------------------
@ -360,6 +361,7 @@ include(cmake/OpenCVFindLibsPerf.cmake)
# ----------------------------------------------------------------------------
# Detect other 3rd-party libraries/tools
# ----------------------------------------------------------------------------
# --- LATEX for pdf documentation ---
if(BUILD_DOCS)
include(cmake/OpenCVFindLATEX.cmake)
@ -835,7 +837,6 @@ status("")
status(" Matlab:")
status(" mex:" MATLAB_MEX_SCRIPT THEN "${MATLAB_MEX_SCRIPT}" ELSE NO)
if (MATLAB_FOUND)
get_property(MEX_WORKS GLOBAL PROPERTY MEX_WORKS)
status(" Compiler/generator:" MEX_WORKS THEN "Working" ELSE "Not working (bindings will not be generated)")
endif()

1
modules/matlab/CMakeLists.txt
View File

@ -187,7 +187,6 @@ if (NOT MEX_WORKS)
endif()
# if we make it here, mex works!
set_property(GLOBAL PROPERTY MEX_WORKS TRUE)
set(MEX_WORKS True CACHE BOOL ADVANCED)