cmake: process modules in the same CMake scope

pull/3010/head
Alexander Alekhin 4 years ago
parent 6a18431421
commit e8ac023368
  1. 6
      modules/julia/cmake/init.cmake
  2. 5
      modules/matlab/cmake/init.cmake

@ -14,9 +14,5 @@ if(WITH_JULIA AND NOT DEFINED Julia_FOUND)
ocv_module_disable(julia)
endif()
# publish vars for status() dumper
set(Julia_FOUND "${Julia_FOUND}" PARENT_SCOPE)
set(Julia_EXECUTABLE "${Julia_EXECUTABLE}" PARENT_SCOPE)
set(HAVE_JULIA "YES" CACHE STRING ADVANCED)
set(HAVE_JULIA ON)
endif()

@ -13,13 +13,8 @@ if(WITH_MATLAB AND NOT DEFINED MATLAB_FOUND)
message(WARNING "Matlab or compiler (mex) was not found. Disabling Matlab bindings...")
ocv_module_disable(matlab)
endif()
# publish vars for status() dumper
set(MATLAB_FOUND "${MATLAB_FOUND}" PARENT_SCOPE)
set(MATLAB_MEX_SCRIPT "${MATLAB_MEX_SCRIPT}" PARENT_SCOPE)
endif()
if(NOT OPENCV_DOCS_INCLUDE_MATLAB)
list(APPEND DOXYGEN_BLACKLIST "matlab")
set(DOXYGEN_BLACKLIST "${DOXYGEN_BLACKLIST}" PARENT_SCOPE)
endif()

Loading…
Cancel
Save