mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 20:21:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindMatlab: Add component to find MCC, the Matlab compiler

Browse Source 
Add component `MCC_COMPILER` to request searching for the Matlab
compiler.  Report it in `Matlab_MCC_COMPILER` if it is found.

Issue: #18183
This commit is contained in:
Jason Heeris
2018-07-24 13:56:01 +10:00
committed by Brad King
parent f0e82ce9a2
commit f34f6eb3d1
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Help/release/dev/FindMatlab-mcc.rst Normal file
View File

@@ -0,0 +1,5 @@
FindMatlab-mcc
--------------
* The :module:`FindMatlab` module gained a new ``MCC_COMPILER``
component to request finding the Matlab Compiler add-on.

23
Modules/FindMatlab.cmake
View File

@@ -25,6 +25,7 @@
# available on the MCR version, and will yield an error if the MCR is found # available on the MCR version, and will yield an error if the MCR is found
# instead of the regular Matlab installation. # instead of the regular Matlab installation.
# * ``MEX_COMPILER`` the MEX compiler. # * ``MEX_COMPILER`` the MEX compiler.
# * ``MCC_COMPILER`` the MCC compiler, included with the Matlab Compiler add-on.
# * ``SIMULINK`` the Simulink environment. # * ``SIMULINK`` the Simulink environment.
# #
# .. note:: # .. note::
@@ -110,7 +111,10 @@
# the whole set of libraries of Matlab # the whole set of libraries of Matlab
# ``Matlab_MEX_COMPILER`` # ``Matlab_MEX_COMPILER``
# the mex compiler of Matlab. Currently not used. # the mex compiler of Matlab. Currently not used.
# Available only if the component ``MEX_COMPILER`` is asked # Available only if the component ``MEX_COMPILER`` is requested.
# ``Matlab_MCC_COMPILER``
# the mcc compiler of Matlab. Included with the Matlab Compiler add-on.
# Available only if the component ``MCC_COMPILER`` is requested.
# #
# Cached variables # Cached variables
# """""""""""""""" # """"""""""""""""
@@ -1420,6 +1424,7 @@ if(DEFINED Matlab_ROOT_DIR_LAST_CACHED)
Matlab_INCLUDE_DIRS Matlab_INCLUDE_DIRS
Matlab_MEX_LIBRARY Matlab_MEX_LIBRARY
Matlab_MEX_COMPILER Matlab_MEX_COMPILER
Matlab_MCC_COMPILER
Matlab_MAIN_PROGRAM Matlab_MAIN_PROGRAM
Matlab_MX_LIBRARY Matlab_MX_LIBRARY
Matlab_ENG_LIBRARY Matlab_ENG_LIBRARY
@@ -1660,6 +1665,22 @@ if(_matlab_find_simulink GREATER -1)
endif() endif()
unset(_matlab_find_simulink) unset(_matlab_find_simulink)
# component MCC Compiler
list(FIND Matlab_FIND_COMPONENTS MCC_COMPILER _matlab_find_mcc_compiler)
if(_matlab_find_mcc_compiler GREATER -1)
find_program(
Matlab_MCC_COMPILER
"mcc"
PATHS ${Matlab_BINARIES_DIR}
DOC "Matlab MCC compiler"
NO_DEFAULT_PATH
)
if(Matlab_MCC_COMPILER)
set(Matlab_MCC_COMPILER_FOUND TRUE)
endif()
endif()
unset(_matlab_find_mcc_compiler)
unset(_matlab_lib_dir_for_search) unset(_matlab_lib_dir_for_search)
set(Matlab_LIBRARIES ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} ${Matlab_ENG_LIBRARY} ${Matlab_MAT_LIBRARY}) set(Matlab_LIBRARIES ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} ${Matlab_ENG_LIBRARY} ${Matlab_MAT_LIBRARY})