Commit 530ad447 authored by hbristow's avatar hbristow

Added fixes to CMakeLists.txt

parent 74accbd9
...@@ -43,6 +43,7 @@ if(DEFINED CMAKE_BUILD_TYPE) ...@@ -43,6 +43,7 @@ if(DEFINED CMAKE_BUILD_TYPE)
endif() endif()
project(OpenCV CXX C) project(OpenCV CXX C)
include(cmake/OpenCVUtils.cmake) include(cmake/OpenCVUtils.cmake)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
...@@ -360,6 +361,7 @@ include(cmake/OpenCVFindLibsPerf.cmake) ...@@ -360,6 +361,7 @@ include(cmake/OpenCVFindLibsPerf.cmake)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Detect other 3rd-party libraries/tools # Detect other 3rd-party libraries/tools
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# --- LATEX for pdf documentation --- # --- LATEX for pdf documentation ---
if(BUILD_DOCS) if(BUILD_DOCS)
include(cmake/OpenCVFindLATEX.cmake) include(cmake/OpenCVFindLATEX.cmake)
...@@ -835,7 +837,6 @@ status("") ...@@ -835,7 +837,6 @@ status("")
status(" Matlab:") status(" Matlab:")
status(" mex:" MATLAB_MEX_SCRIPT THEN "${MATLAB_MEX_SCRIPT}" ELSE NO) status(" mex:" MATLAB_MEX_SCRIPT THEN "${MATLAB_MEX_SCRIPT}" ELSE NO)
if (MATLAB_FOUND) 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)") status(" Compiler/generator:" MEX_WORKS THEN "Working" ELSE "Not working (bindings will not be generated)")
endif() endif()
......
...@@ -187,7 +187,6 @@ if (NOT MEX_WORKS) ...@@ -187,7 +187,6 @@ if (NOT MEX_WORKS)
endif() endif()
# if we make it here, mex works! # if we make it here, mex works!
set_property(GLOBAL PROPERTY MEX_WORKS TRUE)
set(MEX_WORKS True CACHE BOOL ADVANCED) set(MEX_WORKS True CACHE BOOL ADVANCED)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment