diff --git a/CMakeLists.txt b/CMakeLists.txt index 32cef39da3..dd14bbdbe5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/modules/matlab/CMakeLists.txt b/modules/matlab/CMakeLists.txt index 4eb0f4d305..5592f40e8d 100644 --- a/modules/matlab/CMakeLists.txt +++ b/modules/matlab/CMakeLists.txt @@ -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)