[Cmake-commits] CMake branch, next, updated. v3.2.1-1019-g259cff6
Brad King
brad.king at kitware.com
Thu Mar 12 16:00:28 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 259cff6357cba8ca026d1fe9dc98002c861b4c3d (commit)
via 3743aa11fb04cd8823ccfd44a5ca19f3f9e14d1e (commit)
via 842ab1091e7fae4e2622ffa2ac65bfa0c5f3a578 (commit)
via 3c025a5f6ef26e1f1c40024699559f2b7eb82aa2 (commit)
from 76f12008700b61362056b2d84420becd0983c3e6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=259cff6357cba8ca026d1fe9dc98002c861b4c3d
commit 259cff6357cba8ca026d1fe9dc98002c861b4c3d
Merge: 76f1200 3743aa1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 12 16:00:26 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 12 16:00:26 2015 -0400
Merge topic 'FindMatlab-rewrite' into next
3743aa11 FindMatlab: Further revisions
842ab109 FindMatlab: Further revisions
3c025a5f FindMatlab: Rewrite module and provide a usage API
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3743aa11fb04cd8823ccfd44a5ca19f3f9e14d1e
commit 3743aa11fb04cd8823ccfd44a5ca19f3f9e14d1e
Author: Raffi Enficiaud <raffi.enficiaud at tuebingen.mpg.de>
AuthorDate: Thu Mar 12 17:08:44 2015 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 12 15:57:32 2015 -0400
FindMatlab: Further revisions
* Simplified workflow, better isolation of the code when Matlab is to be found from the PATH
* Removing the "which matlab" as the find_program was erroneous
* MATLAB_USER_ROOT renamed to Matlab_ROOT_DIR, which now reflects the found root, removed Matlab_ROOT
* Reduced the number of find_program(matlab)
* Nulled the input stream of the execute_process in order to avoid the troubleshooting with the terminal
* Clearing all the cached variables in case the Matlab_ROOT_DIR is changed by the user
* Marking all but Matlab_ROOT_DIR variable as advanced
* Hiding all internal cache entries
* Avoiding the computation of the version (Matlab_ROOT_DIR set) if the first pass produced the version automatically
* Windows: now versions are ordered starting from the most recent
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 9686a76..d08423b 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -28,14 +28,15 @@
# :command:`matlab_get_release_name_from_version` allow a mapping
# from the release name to the version.
#
-# The variable :variable:`MATLAB_USER_ROOT` may be specified in order to give
+# The variable :variable:`Matlab_ROOT_DIR` may be specified in order to give
# the path of the desired Matlab version. Otherwise, the behaviour is platform
# specific:
#
# * Windows: The installed versions of Matlab are retrieved from the
# Windows registry
# * OS X: The installed versions of Matlab are given by the MATLAB
-# paths in ``/Application``
+# paths in ``/Application``. If no such application is found, it falls back
+# to the one that might be accessible from the PATH.
# * Unix: The desired Matlab should be accessible from the PATH.
#
# Additional information is provided when :variable:`MATLAB_FIND_DEBUG` is set.
@@ -59,7 +60,7 @@
# Users or projects may set the following variables to configure the module
# behaviour:
#
-# :variable:`MATLAB_USER_ROOT`
+# :variable:`Matlab_ROOT_DIR`
# the root of the Matlab installation.
# :variable:`MATLAB_FIND_DEBUG`
# outputs debug information
@@ -77,14 +78,15 @@
# ``TRUE`` if the Matlab installation is found, ``FALSE``
# otherwise. All variable below are defined if Matlab is found.
# ``Matlab_ROOT_DIR``
-# the root of the Matlab installation determined by the FindMatlab module.
+# the final root of the Matlab installation determined by the FindMatlab
+# module.
# ``Matlab_MAIN_PROGRAM``
# the Matlab binary program. Available only if the component ``MAIN_PROGRAM``
# is given in the :command:`find_package` directive.
# ``Matlab_INCLUDE_DIRS``
# the path of the Matlab libraries headers
# ``Matlab_MEX_LIBRARY``
-# library for mex
+# library for mex, always available.
# ``Matlab_MX_LIBRARY``
# mx library of Matlab (arrays). Available only if the component
# ``MX_LIBRARY`` has been requested.
@@ -102,6 +104,9 @@
#
# ``Matlab_MEX_EXTENSION``
# the extension of the mex files for the current platform (given by Matlab).
+# ``Matlab_ROOT_DIR``
+# the location of the root of the Matlab installation found. If this value
+# is changed by the user, the result variables are recomputed.
#
# Provided macros
# ---------------
@@ -162,10 +167,11 @@
# Reference
# --------------
#
-# .. variable:: MATLAB_USER_ROOT
+# .. variable:: Matlab_ROOT_DIR
#
-# The root folder of the Matlab installation. This is set before the call to
-# :command:`find_package`. If not set, then an automatic search of Matlab
+# The root folder of the Matlab installation. If set before the call to
+# :command:`find_package`, the module will look for the components in that
+# path. If not set, then an automatic search of Matlab
# will be performed. If set, it should point to a valid version of Matlab.
#
# .. variable:: MATLAB_FIND_DEBUG
@@ -176,7 +182,6 @@
# .. variable:: MATLAB_ADDITIONAL_VERSIONS
#
# If set, specifies additional versions of Matlab that may be looked for.
-# This variable will be used if :variable:`MATLAB_USER_ROOT` is not set.
# The variable should be a list of strings, organised by pairs of release
# name and versions, such as follows::
#
@@ -192,6 +197,10 @@
# "R2013b=8.2"
# "R2013a=8.1"
# "R2012b=8.0")
+#
+# The order of entries in this list matters when several versions of
+# Matlab are installed. The priority is set according to the ordering in
+# this list.
#=============================================================================
# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
@@ -254,6 +263,7 @@ macro (matlab_get_version_from_release_name release_name version_name)
else()
message(WARNING "The release name ${release_name} is not registered")
endif()
+ unset(_matched)
endmacro()
@@ -356,8 +366,8 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
RESULT_VARIABLE resultMatlab
OUTPUT_VARIABLE varMatlab
ERROR_VARIABLE errMatlab
+ INPUT_FILE NUL
)
- #message("Matlabs = ${varMatlab} | ${resultMatlab}")
set(matlabs_from_registry)
@@ -385,6 +395,12 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
endif()
+ if(matlabs_from_registry)
+ list(REMOVE_DUPLICATES matlabs_from_registry)
+ list(SORT matlabs_from_registry)
+ list(REVERSE matlabs_from_registry)
+ endif()
+
set(${matlab_versions} ${matlabs_from_registry} PARENT_SCOPE)
endfunction()
@@ -424,9 +440,11 @@ macro(extract_matlab_versions_from_registry_brute_force matlab_versions)
# we order from more recent to older
- list(REMOVE_DUPLICATES matlab_supported_versions)
- list(SORT matlab_supported_versions)
- list(REVERSE matlab_supported_versions)
+ if(matlab_supported_versions)
+ list(REMOVE_DUPLICATES matlab_supported_versions)
+ list(SORT matlab_supported_versions)
+ list(REVERSE matlab_supported_versions)
+ endif()
set(${matlab_versions} ${matlab_supported_versions})
@@ -508,7 +526,7 @@ function(matlab_get_mex_suffix matlab_root mex_suffix)
# we first try without suffix, since cmake does not understand a list with
# one empty string element
find_program(
- MATLAB_MEXEXTENSIONS_PROG
+ Matlab_MEXEXTENSIONS_PROG
NAMES mexext
PATHS ${matlab_root}/bin
DOC "Matlab MEX extension provider"
@@ -516,10 +534,10 @@ function(matlab_get_mex_suffix matlab_root mex_suffix)
)
foreach(current_mexext_suffix IN LISTS mexext_suffix)
- if(NOT DEFINED MATLAB_MEXEXTENSIONS_PROG OR NOT MATLAB_MEXEXTENSIONS_PROG)
+ if(NOT DEFINED Matlab_MEXEXTENSIONS_PROG OR NOT Matlab_MEXEXTENSIONS_PROG)
# this call should populate the cache automatically
find_program(
- MATLAB_MEXEXTENSIONS_PROG
+ Matlab_MEXEXTENSIONS_PROG
"mexext${current_mexext_suffix}"
PATHS ${matlab_root}/bin
DOC "Matlab MEX extension provider"
@@ -530,22 +548,31 @@ function(matlab_get_mex_suffix matlab_root mex_suffix)
# the program has been found?
- if((NOT MATLAB_MEXEXTENSIONS_PROG) OR (NOT EXISTS ${MATLAB_MEXEXTENSIONS_PROG}))
+ if((NOT Matlab_MEXEXTENSIONS_PROG) OR (NOT EXISTS ${Matlab_MEXEXTENSIONS_PROG}))
if(MATLAB_FIND_DEBUG)
message(WARNING "[MATLAB] Cannot found mexext program. Matlab root is ${matlab_root}")
endif()
+ unset(Matlab_MEXEXTENSIONS_PROG CACHE)
return()
endif()
set(_matlab_mex_extension)
+ set(devnull)
+ if(UNIX)
+ set(devnull INPUT_FILE /dev/null)
+ elseif(WIN32)
+ set(devnull INPUT_FILE NUL)
+ endif()
execute_process(
- COMMAND ${MATLAB_MEXEXTENSIONS_PROG}
+ COMMAND ${Matlab_MEXEXTENSIONS_PROG}
OUTPUT_VARIABLE _matlab_mex_extension
- ERROR_VARIABLE _matlab_mex_extension_error)
+ ERROR_VARIABLE _matlab_mex_extension_error
+ ${devnull})
string(STRIP ${_matlab_mex_extension} _matlab_mex_extension)
+ unset(Matlab_MEXEXTENSIONS_PROG CACHE)
set(${mex_suffix} ${_matlab_mex_extension} PARENT_SCOPE)
endfunction()
@@ -593,6 +620,13 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
set(_matlab_additional_commands "-wait")
endif()
+ set(devnull)
+ if(UNIX)
+ set(devnull INPUT_FILE /dev/null)
+ elseif(WIN32)
+ set(devnull INPUT_FILE NUL)
+ endif()
+
# timeout set to 30 seconds, in case it does not start
# note as said before OUTPUT_VARIABLE cannot be used in a platform
# independent manner however, not setting it would flush the output of Matlab
@@ -604,6 +638,7 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
ERROR_VARIABLE _matlab_result_version_call_error
TIMEOUT 30
WORKING_DIRECTORY "${_matlab_temporary_folder}"
+ ${devnull}
)
@@ -646,7 +681,9 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
list(APPEND matlab_list_of_all_versions_tmp ${CMAKE_MATCH_1})
endforeach()
- list(REMOVE_DUPLICATES matlab_list_of_all_versions_tmp)
+ if(matlab_list_of_all_versions_tmp)
+ list(REMOVE_DUPLICATES matlab_list_of_all_versions_tmp)
+ endif()
set(${matlab_list_versions} ${matlab_list_of_all_versions_tmp} PARENT_SCOPE)
endif()
@@ -918,245 +955,286 @@ function(matlab_add_mex )
endfunction()
+# (internal)
+# Used to get the version of matlab, using caching. This basically transforms the
+# output of the root list, with possible unknown version, to a version
+#
+function(_Matlab_get_version_from_root matlab_root matlab_known_version matlab_final_version)
+ # if the version is not trivial, we query matlab for that
+ # we keep track of the location of matlab that induced this version
+ #if(NOT DEFINED Matlab_PROG_VERSION_STRING_AUTO_DETECT)
+ # set(Matlab_PROG_VERSION_STRING_AUTO_DETECT "" CACHE INTERNAL "internal matlab location for the discovered version")
+ #endif()
+ if(NOT ${matlab_known_version} STREQUAL "NOTFOUND")
+ # the version is known, we just return it
+ set(${matlab_final_version} ${matlab_known_version} PARENT_SCOPE)
+ set(Matlab_VERSION_STRING_INTERNAL ${matlab_known_version} CACHE INTERNAL "Matlab version (automatically determined)" FORCE)
+ return()
+ endif()
+ #
+ set(_matlab_current_program ${Matlab_MAIN_PROGRAM})
+ # do we already have a matlab program?
+ if(NOT _matlab_current_program)
+ set(_find_matlab_options)
+ if(matlab_root AND EXISTS ${matlab_root})
+ set(_find_matlab_options PATHS ${matlab_root} ${matlab_root}/bin NO_DEFAULT_PATH)
+ endif()
-# this variable will get all Matlab installations found in the current system.
-set(_matlab_possible_roots)
+ find_program(
+ _matlab_current_program
+ matlab
+ ${_find_matlab_options}
+ DOC "Matlab main program"
+ )
+ endif()
+ if(NOT _matlab_current_program OR NOT EXISTS ${_matlab_current_program})
+ # if not found, clear the dependent variables
+ if(MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] Cannot find the main matlab program under ${matlab_root}")
+ endif()
+ set(Matlab_PROG_VERSION_STRING_AUTO_DETECT "" CACHE INTERNAL "internal matlab location for the discovered version" FORCE)
+ set(Matlab_VERSION_STRING_INTERNAL "" CACHE INTERNAL "internal matlab location for the discovered version" FORCE)
+ unset(_matlab_current_program)
+ unset(_matlab_current_program CACHE)
+ return()
+ endif()
-# listing the Matlab versions installed on the WIN machine if MATLAB_USER_ROOT
-# is not set
-if(WIN32)
+ # full real path for path comparison
+ get_filename_component(_matlab_main_real_path_tmp "${_matlab_current_program}" REALPATH)
+ unset(_matlab_current_program)
+ unset(_matlab_current_program CACHE)
- # for windows
+ # is it the same as the previous one?
+ if(_matlab_main_real_path_tmp STREQUAL Matlab_PROG_VERSION_STRING_AUTO_DETECT)
+ set(${matlab_final_version} ${Matlab_VERSION_STRING_INTERNAL} PARENT_SCOPE)
+ return()
+ endif()
+ # update the location of the program
+ set(Matlab_PROG_VERSION_STRING_AUTO_DETECT ${_matlab_main_real_path_tmp} CACHE INTERNAL "internal matlab location for the discovered version" FORCE)
- if(NOT MATLAB_USER_ROOT)
- # if MATLAB_USER_ROOT not specified, we look for Matlab installation in
- # the registry
- # if unsuccessful, we look for all known revision and filter the existing
- # ones.
+ set(matlab_list_of_all_versions)
+ matlab_get_version_from_matlab_run("${Matlab_PROG_VERSION_STRING_AUTO_DETECT}" matlab_list_of_all_versions)
- # testing if we are able to extract the needed information from the registry
- set(matlab_versions_from_registry)
- matlab_extract_all_installed_versions_from_registry(CMAKE_CL_64 matlab_versions_from_registry)
+ list(GET matlab_list_of_all_versions 0 _matlab_version_tmp)
+
+ # set the version into the cache
+ set(Matlab_VERSION_STRING_INTERNAL ${_matlab_version_tmp} CACHE INTERNAL "Matlab version (automatically determined)" FORCE)
+
+ # warning, just in case several versions found (should not happen)
+ list(LENGTH matlab_list_of_all_versions list_of_all_versions_length)
+ if((${list_of_all_versions_length} GREATER 1) AND MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] Found several versions, taking the first one (versions found ${matlab_list_of_all_versions})")
+ endif()
+
+ # return the updated value
+ set(${matlab_final_version} ${Matlab_VERSION_STRING_INTERNAL} PARENT_SCOPE)
+
+endfunction()
- # the returned list is empty, doing the search on all known versions
- if(NOT matlab_versions_from_registry)
- if(MATLAB_FIND_DEBUG)
- message(STATUS "[MATLAB] Search for Matlab from the registry unsuccessful, testing all supported versions")
- endif()
- extract_matlab_versions_from_registry_brute_force(matlab_versions_from_registry)
- endif()
- # filtering the results with the registry keys
- matlab_get_all_valid_matlab_roots_from_registry("${matlab_versions_from_registry}" _matlab_possible_roots)
- elseif(NOT EXISTS ${MATLAB_USER_ROOT})
+# ###################################
+# Exploring the possible Matlab_ROOTS
- # if MATLAB_USER_ROOT specified but erroneous
+# this variable will get all Matlab installations found in the current system.
+set(_matlab_possible_roots)
+
+
+
+if(Matlab_ROOT_DIR)
+ # if the user specifies a possible root, we keep this one
+
+ if(NOT EXISTS ${Matlab_ROOT_DIR})
+ # if Matlab_ROOT_DIR specified but erroneous
if(MATLAB_FIND_DEBUG)
- message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
+ message(WARNING "[MATLAB] the specified path for Matlab_ROOT_DIR does not exist (${Matlab_ROOT_DIR})")
endif()
else()
- list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
+ # NOTFOUND indicates the code below to search for the version automatically
+ if(NOT DEFINED Matlab_VERSION_STRING_INTERNAL)
+ list(APPEND _matlab_possible_roots "NOTFOUND" ${Matlab_ROOT_DIR}) # empty version
+ else()
+ list(APPEND _matlab_possible_roots ${Matlab_VERSION_STRING_INTERNAL} ${Matlab_ROOT_DIR}) # cached version
+ endif()
endif()
else()
- # for linux/osx
- if(NOT MATLAB_USER_ROOT)
+ # if the user does not specify the possible installation root, we look for
+ # one installation using the appropriate heuristics
- # if MATLAB_USER_ROOT not specified, we look for Matlab from the command
- # line PATH
- # maybe using CMAKE_PROGRAM_PATH to add some more hints
+ if(WIN32)
- set(_matlab_main_tmp "")
- if(Matlab_MAIN_PROGRAM)
- set(_matlab_main_tmp ${Matlab_MAIN_PROGRAM})
- endif()
+ # On WIN32, we look for Matlab installation in the registry
+ # if unsuccessful, we look for all known revision and filter the existing
+ # ones.
- if(NOT _matlab_main_tmp)
+ # testing if we are able to extract the needed information from the registry
+ set(_matlab_versions_from_registry)
+ matlab_extract_all_installed_versions_from_registry(CMAKE_CL_64 _matlab_versions_from_registry)
- find_program(
- _matlab_main_tmp
- NAMES matlab)
-
- if(NOT _matlab_main_tmp)
- execute_process(
- COMMAND "which" matlab
- OUTPUT_VARIABLE _matlab_main_tmp
- ERROR_VARIABLE _matlab_main_tmp_err)
- # the output should be cleaned up
- string(STRIP "${_matlab_main_tmp}" _matlab_main_tmp)
- endif()
+ # the returned list is empty, doing the search on all known versions
+ if(NOT _matlab_versions_from_registry)
- if(EXISTS ${_matlab_main_tmp})
- if(MATLAB_FIND_DEBUG)
- message(STATUS "[MATLAB] matlab found from PATH: ${_matlab_main_tmp}")
- endif()
- else()
- # found candidate is not good, we remove it
- unset(_matlab_main_tmp)
- unset(_matlab_main_tmp CACHE)
+ if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] Search for Matlab from the registry unsuccessful, testing all supported versions")
endif()
- endif() # if(NOT _matlab_main_tmp)
-
- if(_matlab_main_tmp AND EXISTS ${_matlab_main_tmp})
- # resolve symlinks
- get_filename_component(_matlab_current_location "${_matlab_main_tmp}" REALPATH)
- set(_directory_alias DIRECTORY)
-
- # get the directory (the command below has to be run twice)
- get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias})
- get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias}) # Matlab should be in bin
- list(APPEND _matlab_possible_roots "NOTFOUND" ${_matlab_current_location}) # empty version
+ extract_matlab_versions_from_registry_brute_force(_matlab_versions_from_registry)
endif()
+ # filtering the results with the registry keys
+ matlab_get_all_valid_matlab_roots_from_registry("${_matlab_versions_from_registry}" _matlab_possible_roots)
+ unset(_matlab_versions_from_registry)
+
+ elseif(APPLE)
# on mac, we look for the /Application paths
# this corresponds to the behaviour on Windows. On Linux, we do not have
# any other guess.
- if((NOT _matlab_possible_roots) AND APPLE)
+ matlab_get_supported_releases(_matlab_releases)
+ if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] Matlab supported versions ${_matlab_releases}. If more version should be supported "
+ "the variable MATLAB_ADDITIONAL_VERSIONS can be set according to the documentation")
+ endif()
- matlab_get_supported_releases(_matlab_releases)
- if(MATLAB_FIND_DEBUG)
- message(STATUS "[MATLAB] Matlab supported versions ${_matlab_releases}. If more version should be supported "
- "the variable MATLAB_ADDITIONAL_VERSIONS can be set according to the documentation")
+ foreach(_matlab_current_release IN LISTS _matlab_releases)
+ set(_matlab_full_string "/Applications/MATLAB_${_matlab_current_release}.app")
+ if(EXISTS ${_matlab_full_string})
+ set(_matlab_current_version)
+ matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version)
+ if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] Found version ${_matlab_current_release} (${_matlab_current_version}) in ${_matlab_full_string}")
+ endif()
+ list(APPEND _matlab_possible_roots ${_matlab_current_version} ${_matlab_full_string})
+ unset(_matlab_current_version)
endif()
- foreach(_matlab_current_release IN LISTS _matlab_releases)
- set(_matlab_full_string "/Applications/MATLAB_${_matlab_current_release}.app")
- if(EXISTS ${_matlab_full_string})
- set(_matlab_current_version)
- matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version)
- if(MATLAB_FIND_DEBUG)
- message(STATUS "[MATLAB] Found version ${_matlab_current_release} (${_matlab_current_version}) in ${_matlab_full_string}")
- endif()
- list(APPEND _matlab_possible_roots ${_matlab_current_version})
- list(APPEND _matlab_possible_roots ${_matlab_full_string})
- unset(_matlab_current_version)
- endif()
+ unset(_matlab_full_string)
+ endforeach(_matlab_current_release)
- unset(_matlab_full_string)
- endforeach(_matlab_current_release)
- unset(_matlab_current_release)
- unset(_matlab_releases)
- endif()
+ unset(_matlab_current_release)
+ unset(_matlab_releases)
+
+ endif()
+
+endif()
+
+
+
+list(LENGTH _matlab_possible_roots _numbers_of_matlab_roots)
+if(_numbers_of_matlab_roots EQUAL 0)
+ # if we have not found anything, we fall back on the PATH
+
+
+ # At this point, we have no other choice than trying to find it from PATH.
+ # If set by the user, this wont change
+ find_program(
+ _matlab_main_tmp
+ NAMES matlab)
- # we need to clear _matlab_main_tmp here
- unset(_matlab_main_tmp CACHE)
- unset(_matlab_main_tmp)
- elseif(NOT EXISTS ${MATLAB_USER_ROOT})
- # if MATLAB_USER_ROOT specified but erroneous
+ if(_matlab_main_tmp)
+ # we then populate the list of roots, with empty version
if(MATLAB_FIND_DEBUG)
- message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
+ message(STATUS "[MATLAB] matlab found from PATH: ${_matlab_main_tmp}")
endif()
- else()
- list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
+
+ # resolve symlinks
+ get_filename_component(_matlab_current_location "${_matlab_main_tmp}" REALPATH)
+
+ # get the directory (the command below has to be run twice)
+ # this will be the matlab root
+ get_filename_component(_matlab_current_location "${_matlab_current_location}" DIRECTORY)
+ get_filename_component(_matlab_current_location "${_matlab_current_location}" DIRECTORY) # Matlab should be in bin
+
+ list(APPEND _matlab_possible_roots "NOTFOUND" ${_matlab_current_location})
+
+ unset(_matlab_current_location)
+
endif()
+ unset(_matlab_main_tmp CACHE)
+
endif()
+
+
+
if(MATLAB_FIND_DEBUG)
message(STATUS "[MATLAB] Matlab root folders are ${_matlab_possible_roots}")
endif()
-if(DEFINED Matlab_ROOT_DIR)
- unset(Matlab_ROOT_DIR)
-endif()
+
# take the first possible Matlab root
-if(_matlab_possible_roots)
+list(LENGTH _matlab_possible_roots _numbers_of_matlab_roots)
+set(Matlab_VERSION_STRING "NOTFOUND")
+if(_numbers_of_matlab_roots GREATER 0)
list(GET _matlab_possible_roots 0 Matlab_VERSION_STRING)
list(GET _matlab_possible_roots 1 Matlab_ROOT_DIR)
- list(LENGTH _matlab_possible_roots numbers_of_matlab_roots)
# adding a warning in case of ambiguity
- if(numbers_of_matlab_roots GREATER 2 AND MATLAB_FIND_DEBUG)
+ if(_numbers_of_matlab_roots GREATER 2 AND MATLAB_FIND_DEBUG)
message(WARNING "[MATLAB] Found several distributions of Matlab. Setting the current version to ${Matlab_VERSION_STRING} (located ${Matlab_ROOT_DIR})."
- " If this is not the desired behaviour, provide the -DMATLAB_USER_ROOT on the command line")
+ " If this is not the desired behaviour, provide the -DMatlab_ROOT_DIR=... on the command line")
endif()
endif()
-if((NOT (DEFINED Matlab_VERSION_STRING)) OR (NOT Matlab_VERSION_STRING))
- set(Matlab_VERSION_STRING "NOTFOUND")
-endif()
-
-
-
-# if the version is not trivial, we query matlab for that
-# we keep track of the location of matlab that induced this version
-set(Matlab_VERSION_STRING_AUTO_DETECT "" CACHE INTERNAL "internal matlab location for the discovered version")
-
-set(_matlab_version_should_be_recomputed FALSE)
-if(${Matlab_VERSION_STRING} STREQUAL "NOTFOUND")
- set(_matlab_version_should_be_recomputed TRUE)
-elseif((NOT Matlab_MAIN_PROGRAM) OR (NOT EXISTS ${Matlab_MAIN_PROGRAM}))
- set(_matlab_version_should_be_recomputed TRUE)
-else()
- # just in case the variable is modified to a symlink
- get_filename_component(_matlab_main_tmp "${Matlab_MAIN_PROGRAM}" REALPATH)
- if(NOT (_matlab_main_tmp STREQUAL Matlab_VERSION_STRING_AUTO_DETECT))
- set(_matlab_version_should_be_recomputed TRUE)
+# check if the root changed against the previous defined one, if so
+# clear all the cached variables
+if(DEFINED Matlab_ROOT_DIR_LAST_CACHED)
+
+ if(NOT Matlab_ROOT_DIR_LAST_CACHED STREQUAL Matlab_ROOT_DIR)
+ set(_Matlab_cached_vars
+ Matlab_INCLUDE_DIRS
+ Matlab_MEX_LIBRARY
+ Matlab_MEX_COMPILER
+ Matlab_MAIN_PROGRAM
+ Matlab_MX_LIBRARY
+ Matlab_ENG_LIBRARY
+ Matlab_MEX_EXTENSION
+
+ # internal
+ Matlab_MEXEXTENSIONS_PROG
+ Matlab_ROOT_DIR_LAST_CACHED
+ #Matlab_PROG_VERSION_STRING_AUTO_DETECT
+ Matlab_VERSION_STRING_INTERNAL
+ )
+ foreach(_var IN LISTS _Matlab_cached_vars)
+ if(DEFINED ${_var})
+ unset(${_var} CACHE)
+ endif()
+ endforeach()
endif()
endif()
-if(_matlab_version_should_be_recomputed)
- if(MATLAB_FIND_DEBUG)
- message(STATUS "[MATLAB] querying for version from Matlab root = ${Matlab_ROOT_DIR}")
- endif()
-
- if(Matlab_MAIN_PROGRAM)
- set(_matlab_main_tmp ${Matlab_MAIN_PROGRAM})
- else()
- find_program(
- _matlab_main_tmp
- matlab
- PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
- DOC "Matlab main program"
- NO_DEFAULT_PATH
- )
- endif()
-
- if(_matlab_main_tmp)
- set(matlab_list_of_all_versions)
- matlab_get_version_from_matlab_run("${_matlab_main_tmp}" matlab_list_of_all_versions)
-
- list(GET matlab_list_of_all_versions 0 MATLAB_VERSION_tmp)
+set(Matlab_ROOT_DIR_LAST_CACHED ${Matlab_ROOT_DIR} CACHE INTERNAL "last Matlab root dir location")
+set(Matlab_ROOT_DIR ${Matlab_ROOT_DIR} CACHE PATH "Matlab installation root path" FORCE)
- # set the version into the cache
- set(Matlab_VERSION_STRING ${MATLAB_VERSION_tmp} CACHE INTERNAL "Matlab version (automatically determined)" FORCE)
- list(LENGTH list_of_all_versions list_of_all_versions_length)
- if((${list_of_all_versions_length} GREATER 1) AND MATLAB_FIND_DEBUG)
- message(WARNING "[MATLAB] Found several versions, taking the first one (versions found ${list_of_all_versions})")
- endif()
+# Fix the version, in case this one is NOTFOUND
+_Matlab_get_version_from_root(
+ "${Matlab_ROOT_DIR}"
+ ${Matlab_VERSION_STRING}
+ Matlab_VERSION_STRING
+)
- # update the location of Matlab that produced this value
- # we store the real path for comparison
- get_filename_component(_matlab_main_tmp1 "${_matlab_main_tmp}" REALPATH)
- set(Matlab_VERSION_STRING_AUTO_DETECT ${_matlab_main_tmp1} CACHE INTERNAL "internal matlab location for the discovered version" FORCE)
- # these are internal variables
- unset(_matlab_main_tmp)
- unset(_matlab_main_tmp CACHE)
- unset(_matlab_main_tmp1)
- endif()
-endif()
if(MATLAB_FIND_DEBUG)
@@ -1289,16 +1367,15 @@ unset(_matlab_find_mex_compiler)
# component Matlab program
list(FIND Matlab_FIND_COMPONENTS MAIN_PROGRAM _matlab_find_matlab_program)
if(_matlab_find_matlab_program GREATER -1)
- # todo cleanup with code above
- if(NOT DEFINED Matlab_MAIN_PROGRAM)
- find_program(
- Matlab_MAIN_PROGRAM
- matlab
- PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
- DOC "Matlab main program"
- NO_DEFAULT_PATH
- )
- endif()
+
+ find_program(
+ Matlab_MAIN_PROGRAM
+ matlab
+ PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
+ DOC "Matlab main program"
+ NO_DEFAULT_PATH
+ )
+
if(Matlab_MAIN_PROGRAM)
set(Matlab_MAIN_PROGRAM_FOUND TRUE)
endif()
@@ -1349,19 +1426,13 @@ unset(_matlab_lib_dir_for_search)
set(Matlab_LIBRARIES ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} ${Matlab_ENG_LIBRARY})
-if(CMAKE_VERSION VERSION_LESS "2.8.11")
- find_package_handle_standard_args(
- Matlab
- REQUIRED_VARS ${_matlab_required_variables}
- VERSION_VAR Matlab_VERSION_STRING)
-else()
- find_package_handle_standard_args(
- Matlab
- FOUND_VAR Matlab_FOUND
- REQUIRED_VARS ${_matlab_required_variables} #MATLAB_REQUIRED_PROGRAMS MATLAB_REQUIRED_LIBRARIES MATLAB_REQUIRED_INCLUDE_DIRS
- VERSION_VAR Matlab_VERSION_STRING
- HANDLE_COMPONENTS)
-endif()
+
+find_package_handle_standard_args(
+ Matlab
+ FOUND_VAR Matlab_FOUND
+ REQUIRED_VARS ${_matlab_required_variables}
+ VERSION_VAR Matlab_VERSION_STRING
+ HANDLE_COMPONENTS)
unset(_matlab_required_variables)
unset(_matlab_bin_prefix)
@@ -1373,17 +1444,18 @@ unset(_matlab_lib_prefix_for_search)
if(Matlab_INCLUDE_DIRS AND Matlab_LIBRARIES)
mark_as_advanced(
- Matlab_LIBRARIES
+ #Matlab_LIBRARIES
Matlab_MEX_LIBRARY
Matlab_MX_LIBRARY
Matlab_ENG_LIBRARY
Matlab_INCLUDE_DIRS
Matlab_FOUND
- MATLAB_USER_ROOT
- Matlab_ROOT_DIR
- Matlab_VERSION_STRING
+ #Matlab_ROOT_DIR
+ #Matlab_VERSION_STRING
Matlab_MAIN_PROGRAM
+ #Matlab_MEX_EXTENSION
+ Matlab_MEXEXTENSIONS_PROG
Matlab_MEX_EXTENSION
- Matlab_BINARIES_DIR
+ #Matlab_BINARIES_DIR
)
endif()
diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
index 804101c..ebccbf6 100644
--- a/Modules/MatlabTestsRedirect.cmake
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -62,12 +62,20 @@ set(Matlab_SCRIPT_TO_RUN
set(Matlab_LOG_FILE "${output_directory}/${test_name}.log")
+set(devnull)
+if(UNIX)
+ set(devnull INPUT_FILE /dev/null)
+elseif(WIN32)
+ set(devnull INPUT_FILE NUL)
+endif()
+
execute_process(
COMMAND "${Matlab_PROGRAM}" ${Matlab_UNIT_TESTS_CMD} -logfile "${test_name}.log" -r "${Matlab_SCRIPT_TO_RUN}"
RESULT_VARIABLE res
TIMEOUT ${test_timeout}
OUTPUT_QUIET # we do not want the output twice
WORKING_DIRECTORY "${output_directory}"
+ ${devnull}
)
if(NOT EXISTS ${Matlab_LOG_FILE})
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
index 66be1bb..11d5e9e 100644
--- a/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
@@ -9,7 +9,8 @@ classdef cmake_matlab_unit_tests_timeout < matlab.unittest.TestCase
function testCallHangsShouldBeTimedOut(testCase)
cmake_matlab_mex1(rand(3,3));
disp('Will now wait.');
- input('Testing the cmake Matlab package timeout - do not press anything');
+ disp('Testing the cmake Matlab package timeout - do not kill');
+ pause(20); % supposed to be killed after 15s
end
end
end
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=842ab1091e7fae4e2622ffa2ac65bfa0c5f3a578
commit 842ab1091e7fae4e2622ffa2ac65bfa0c5f3a578
Author: Raffi Enficiaud <raffi.enficiaud at tuebingen.mpg.de>
AuthorDate: Thu Feb 19 14:36:27 2015 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 12 15:30:23 2015 -0400
FindMatlab: Further revisions
- Adding R2014a
- Stripping the output of the which commando
- Simplifying the registry query
- Silencing the stderr of the execute_process commands
- Condition on the recomputation of the version fixed
- Fixed the space issues for the matlab temporary folder
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 6185935..9686a76 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -219,6 +219,7 @@ if(NOT MATLAB_ADDITIONAL_VERSIONS)
endif()
set(MATLAB_VERSIONS_MAPPING
+ "R2014a=8.3"
"R2013b=8.2"
"R2013a=8.1"
"R2012b=8.0"
@@ -235,8 +236,8 @@ set(MATLAB_VERSIONS_MAPPING
# temporary folder for all Matlab runs
set(_matlab_temporary_folder ${CMAKE_BINARY_DIR}/Matlab)
-if(NOT EXISTS ${_matlab_temporary_folder})
- file(MAKE_DIRECTORY ${_matlab_temporary_folder})
+if(NOT EXISTS "${_matlab_temporary_folder}")
+ file(MAKE_DIRECTORY "${_matlab_temporary_folder}")
endif()
#.rst:
@@ -341,21 +342,6 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
message(FATAL_ERROR "This macro can only be called by a windows host (call to reg.exe")
endif()
- # list the keys under HKEY_LOCAL_MACHINE\SOFTWARE\mathworks but the call to
- # reg does not work from cmake, curiously, as is. The command provides the
- # desired result under the command line though.
- # Fix: this is because "/reg:64" should appended to the command, otherwise
- # it gets on the 32 bits software key (curiously again)
- find_program(MATLAB_REG_EXE_LOCATION "reg")
-
- # if reg.exe is not found, then it is impossible to use this method.
- if(NOT MATLAB_REG_EXE_LOCATION)
- if(MATLAB_FIND_DEBUG)
- message(WARNING "[MATLAB] reg.exe not found")
- endif()
- set(${matlab_versions} "" PARENT_SCOPE)
- return()
- endif()
if(${win64} AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "64")
set(APPEND_REG "/reg:64")
@@ -366,7 +352,7 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
# /reg:64 should be added on 64 bits capable OSs in order to enable the
# redirection of 64 bits applications
execute_process(
- COMMAND ${MATLAB_REG_EXE_LOCATION} query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
+ COMMAND reg query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
RESULT_VARIABLE resultMatlab
OUTPUT_VARIABLE varMatlab
ERROR_VARIABLE errMatlab
@@ -523,7 +509,7 @@ function(matlab_get_mex_suffix matlab_root mex_suffix)
# one empty string element
find_program(
MATLAB_MEXEXTENSIONS_PROG
- "mexext"
+ NAMES mexext
PATHS ${matlab_root}/bin
DOC "Matlab MEX extension provider"
NO_DEFAULT_PATH
@@ -556,7 +542,8 @@ function(matlab_get_mex_suffix matlab_root mex_suffix)
execute_process(
COMMAND ${MATLAB_MEXEXTENSIONS_PROG}
- OUTPUT_VARIABLE _matlab_mex_extension)
+ OUTPUT_VARIABLE _matlab_mex_extension
+ ERROR_VARIABLE _matlab_mex_extension_error)
string(STRIP ${_matlab_mex_extension} _matlab_mex_extension)
set(${mex_suffix} ${_matlab_mex_extension} PARENT_SCOPE)
@@ -590,11 +577,11 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
message(STATUS "[MATLAB] Determining the version of Matlab from ${matlab_binary_program}")
endif()
- if(EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+ if(EXISTS "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
if(MATLAB_FIND_DEBUG)
message(STATUS "[MATLAB] Removing previous ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp file")
endif()
- file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+ file(REMOVE "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
endif()
@@ -611,10 +598,12 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
# independent manner however, not setting it would flush the output of Matlab
# in the current console (unix variant)
execute_process(
- COMMAND ${matlab_binary_program} -nosplash -nojvm ${_matlab_additional_commands} -logfile ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp -nodesktop -nodisplay -r "version, exit"
+ COMMAND "${matlab_binary_program}" -nosplash -nojvm ${_matlab_additional_commands} -logfile "matlabVersionLog.cmaketmp" -nodesktop -nodisplay -r "version, exit"
OUTPUT_VARIABLE _matlab_version_from_cmd_dummy
RESULT_VARIABLE _matlab_result_version_call
+ ERROR_VARIABLE _matlab_result_version_call_error
TIMEOUT 30
+ WORKING_DIRECTORY "${_matlab_temporary_folder}"
)
@@ -623,7 +612,7 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call returned with error ${_matlab_result_version_call}.")
endif()
return()
- elseif(NOT EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+ elseif(NOT EXISTS "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
if(MATLAB_FIND_DEBUG)
message(WARNING "[MATLAB] Unable to determine the version of Matlab. The log file does not exist.")
endif()
@@ -631,8 +620,8 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
endif()
# if successful, read back the log
- file(READ ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp _matlab_version_from_cmd)
- file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+ file(READ "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp" _matlab_version_from_cmd)
+ file(REMOVE "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
set(index -1)
string(FIND ${_matlab_version_from_cmd} "ans" index)
@@ -997,28 +986,20 @@ else()
endif()
if(NOT _matlab_main_tmp)
- # if we get there a second time and the folder matlab is created here,
- # and then the find_program does not find it,
- # the get_filename_component (... PROGRAM) finds this directory instead.
+
find_program(
_matlab_main_tmp
- "matlab")
+ NAMES matlab)
if(NOT _matlab_main_tmp)
- #execute_process(COMMAND which matlab OUTPUT_VARIABLE _which_matlab
- # RESULT_VARIABLE _which_matlab_result)
- get_filename_component(_matlab_main_tmp "matlab" PROGRAM)
-
- # "bug" of cmake: if we call get_filename_component with PROGRAM, it can
- # return us a directory
- if((NOT EXISTS ${_matlab_main_tmp}) OR (IS_DIRECTORY ${_matlab_main_tmp}))
- execute_process(
- COMMAND "which matlab"
- OUTPUT_VARIABLE _matlab_main_tmp)
- endif()
+ execute_process(
+ COMMAND "which" matlab
+ OUTPUT_VARIABLE _matlab_main_tmp
+ ERROR_VARIABLE _matlab_main_tmp_err)
+ # the output should be cleaned up
+ string(STRIP "${_matlab_main_tmp}" _matlab_main_tmp)
endif()
-
if(EXISTS ${_matlab_main_tmp})
if(MATLAB_FIND_DEBUG)
message(STATUS "[MATLAB] matlab found from PATH: ${_matlab_main_tmp}")
@@ -1032,7 +1013,6 @@ else()
endif() # if(NOT _matlab_main_tmp)
if(_matlab_main_tmp AND EXISTS ${_matlab_main_tmp})
-
# resolve symlinks
get_filename_component(_matlab_current_location "${_matlab_main_tmp}" REALPATH)
set(_directory_alias DIRECTORY)
@@ -1141,7 +1121,7 @@ if(_matlab_version_should_be_recomputed)
message(STATUS "[MATLAB] querying for version from Matlab root = ${Matlab_ROOT_DIR}")
endif()
- if(NOT Matlab_MAIN_PROGRAM)
+ if(Matlab_MAIN_PROGRAM)
set(_matlab_main_tmp ${Matlab_MAIN_PROGRAM})
else()
find_program(
@@ -1155,7 +1135,7 @@ if(_matlab_version_should_be_recomputed)
if(_matlab_main_tmp)
set(matlab_list_of_all_versions)
- matlab_get_version_from_matlab_run(${_matlab_main_tmp} matlab_list_of_all_versions)
+ matlab_get_version_from_matlab_run("${_matlab_main_tmp}" matlab_list_of_all_versions)
list(GET matlab_list_of_all_versions 0 MATLAB_VERSION_tmp)
diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
index 46d1ef8..804101c 100644
--- a/Modules/MatlabTestsRedirect.cmake
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -60,13 +60,14 @@ set(Matlab_SCRIPT_TO_RUN
"addpath(${concat_string}), path, ${cmd_to_run_before_test}, ${unittest_to_run}"
)
-set(Matlab_LOG_FILE ${output_directory}/${test_name}.log)
+set(Matlab_LOG_FILE "${output_directory}/${test_name}.log")
execute_process(
- COMMAND ${Matlab_PROGRAM} ${Matlab_UNIT_TESTS_CMD} -logfile ${Matlab_LOG_FILE} -r ${Matlab_SCRIPT_TO_RUN}
+ COMMAND "${Matlab_PROGRAM}" ${Matlab_UNIT_TESTS_CMD} -logfile "${test_name}.log" -r "${Matlab_SCRIPT_TO_RUN}"
RESULT_VARIABLE res
TIMEOUT ${test_timeout}
OUTPUT_QUIET # we do not want the output twice
+ WORKING_DIRECTORY "${output_directory}"
)
if(NOT EXISTS ${Matlab_LOG_FILE})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c025a5f6ef26e1f1c40024699559f2b7eb82aa2
commit 3c025a5f6ef26e1f1c40024699559f2b7eb82aa2
Author: Raffi Enficiaud <raffi.enficiaud at tuebingen.mpg.de>
AuthorDate: Thu Feb 12 17:13:31 2015 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 12 15:30:23 2015 -0400
FindMatlab: Rewrite module and provide a usage API
Implementation of the new FindMatlab module
- FindMatlab learned about versions and components
- ability to find Matlab and its version in a more precise and multiplatform way
- ability to add new mex extension with a macro
- ability to add a documentation
- ability to add matlab unit tests (with or without the unit test framework)
- reworked documentation
diff --git a/Help/release/dev/FindMatlab-rewrite.rst b/Help/release/dev/FindMatlab-rewrite.rst
new file mode 100644
index 0000000..07727b8
--- /dev/null
+++ b/Help/release/dev/FindMatlab-rewrite.rst
@@ -0,0 +1,7 @@
+FindMatlab-rewrite
+------------------
+
+* The :module:`FindMatlab` module was completely rewritten. It learned
+ about versions and components and to find Matlab in a more precise and
+ multiplatform way. The module now offers APIs to create mex extensions,
+ documentation, and unit tests.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 73b3a5b..6185935 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -2,20 +2,199 @@
# FindMatlab
# ----------
#
-# this module looks for Matlab
+# Finds Matlab installations and provides Matlab tools and libraries to cmake.
#
-# Defines:
+# This package first intention is to find the libraries associated with Matlab
+# in order to be able to build Matlab extensions (mex files). It can also be
+# used:
#
-# ::
+# * run specific commands in Matlab
+# * declare Matlab unit test
+# * retrieve various information from Matlab (mex extensions, versions and
+# release queries, ...)
#
-# MATLAB_INCLUDE_DIR: include path for mex.h, engine.h
-# MATLAB_LIBRARIES: required libraries: libmex, etc
-# MATLAB_MEX_LIBRARY: path to libmex.lib
-# MATLAB_MX_LIBRARY: path to libmx.lib
-# MATLAB_ENG_LIBRARY: path to libeng.lib
+# The module supports the following components:
+#
+# * ``MX_LIBRARY`` and ``ENG_LIBRARY`` respectively the MX and ENG libraries of
+# Matlab
+# * ``MAIN_PROGRAM`` the Matlab binary program.
+#
+# .. note::
+#
+# The version given to the :command:`find_package` directive is the Matlab
+# **version**, which should not be confused with the Matlab *release* name
+# (eg. `R2014`).
+# The :command:`matlab_get_version_from_release_name` and
+# :command:`matlab_get_release_name_from_version` allow a mapping
+# from the release name to the version.
+#
+# The variable :variable:`MATLAB_USER_ROOT` may be specified in order to give
+# the path of the desired Matlab version. Otherwise, the behaviour is platform
+# specific:
+#
+# * Windows: The installed versions of Matlab are retrieved from the
+# Windows registry
+# * OS X: The installed versions of Matlab are given by the MATLAB
+# paths in ``/Application``
+# * Unix: The desired Matlab should be accessible from the PATH.
+#
+# Additional information is provided when :variable:`MATLAB_FIND_DEBUG` is set.
+# When a Matlab binary is found automatically and the ``MATLAB_VERSION``
+# is not given, the version is queried from Matlab directly.
+# On Windows, it can make a window running Matlab appear.
+#
+# The mapping of the release names and the version of Matlab is performed by
+# defining pairs (name, version). The variable
+# :variable:`MATLAB_ADDITIONAL_VERSIONS` may be provided before the call to
+# the :command:`find_package` in order to handle additional versions.
+#
+# A Matlab scripts can be added to the set of tests using the
+# :command:`matlab_add_unit_test`. By default, the Matlab unit test framework
+# will be used (>= 2013a) to run this script, but regular ``.m`` files
+# returning an exit code can be used as well (0 indicating a success).
+#
+# Module Input Variables
+# ----------------------
+#
+# Users or projects may set the following variables to configure the module
+# behaviour:
+#
+# :variable:`MATLAB_USER_ROOT`
+# the root of the Matlab installation.
+# :variable:`MATLAB_FIND_DEBUG`
+# outputs debug information
+# :variable:`MATLAB_ADDITIONAL_VERSIONS`
+# additional versions of Matlab for the automatic retrieval of the installed
+# versions.
+#
+# Variables defined by the module
+# -------------------------------
+#
+# Result variables
+# ^^^^^^^^^^^^^^^^
+#
+# ``Matlab_FOUND``
+# ``TRUE`` if the Matlab installation is found, ``FALSE``
+# otherwise. All variable below are defined if Matlab is found.
+# ``Matlab_ROOT_DIR``
+# the root of the Matlab installation determined by the FindMatlab module.
+# ``Matlab_MAIN_PROGRAM``
+# the Matlab binary program. Available only if the component ``MAIN_PROGRAM``
+# is given in the :command:`find_package` directive.
+# ``Matlab_INCLUDE_DIRS``
+# the path of the Matlab libraries headers
+# ``Matlab_MEX_LIBRARY``
+# library for mex
+# ``Matlab_MX_LIBRARY``
+# mx library of Matlab (arrays). Available only if the component
+# ``MX_LIBRARY`` has been requested.
+# ``Matlab_ENG_LIBRARY``
+# Matlab engine library. Available only if the component ``ENG_LIBRARY``
+# is requested.
+# ``Matlab_LIBRARIES``
+# the whole set of libraries of Matlab
+# ``Matlab_MEX_COMPILER``
+# the mex compiler of Matlab. Currently not used.
+# Available only if the component ``MEX_COMPILER`` is asked
+#
+# Cached variables
+# ^^^^^^^^^^^^^^^^
+#
+# ``Matlab_MEX_EXTENSION``
+# the extension of the mex files for the current platform (given by Matlab).
+#
+# Provided macros
+# ---------------
+#
+# :command:`matlab_get_version_from_release_name`
+# returns the version from the release name
+# :command:`matlab_get_release_name_from_version`
+# returns the release name from the Matlab version
+#
+# Provided functions
+# ------------------
+#
+# :command:`matlab_add_mex`
+# adds a target compiling a MEX file.
+# :command:`matlab_add_unit_test`
+# adds a Matlab unit test file as a test to the project.
+# :command:`matlab_extract_all_installed_versions_from_registry`
+# parses the registry for all Matlab versions. Available on Windows only.
+# The part of the registry parsed is dependent on the host processor
+# :command:`matlab_get_all_valid_matlab_roots_from_registry`
+# returns all the possible Matlab paths, according to a previously
+# given list. Only the existing/accessible paths are kept. This is mainly
+# useful for the searching all possible Matlab installation.
+# :command:`matlab_get_mex_suffix`
+# returns the suffix to be used for the mex files
+# (platform/architecture dependant)
+# :command:`matlab_get_version_from_matlab_run`
+# returns the version of Matlab, given the full directory of the Matlab program.
+#
+#
+# Known issues
+# ------------
+#
+# **Symbol clash in a MEX target**
+# By default, every symbols inside a MEX
+# file defined with the command :command:`matlab_add_mex` have hidden
+# visibility, except for the entry point. This is the default behaviour of
+# the MEX compiler, which lowers the risk of symbol collision between the
+# libraries shipped with Matlab, and the libraries to which the MEX file is
+# linking to. This is also the default on Windows platforms.
+#
+# However, this is not sufficient in certain case, where for instance your
+# MEX file is linking against libraries that are already loaded by Matlab,
+# even if those libraries have different SONAMES.
+# A possible solution is to hide the symbols of the libraries to which the
+# MEX target is linking to. This can be achieved in GNU GCC compilers with
+# the linker option ``-Wl,--exclude-libs,ALL``.
+#
+# **Tests using GPU resources**
+# in case your MEX file is using the GPU and
+# in order to be able to run unit tests on this MEX file, the GPU resources
+# should be properly released by Matlab. A possible solution is to make
+# Matlab aware of the use of the GPU resources in the session, which can be
+# performed by a command such as ``D = gpuDevice()`` at the beginning of
+# the test script (or via a fixture).
+#
+#
+# Reference
+# --------------
+#
+# .. variable:: MATLAB_USER_ROOT
+#
+# The root folder of the Matlab installation. This is set before the call to
+# :command:`find_package`. If not set, then an automatic search of Matlab
+# will be performed. If set, it should point to a valid version of Matlab.
+#
+# .. variable:: MATLAB_FIND_DEBUG
+#
+# If set, the lookup of Matlab and the intermediate configuration steps are
+# outputted to the console.
+#
+# .. variable:: MATLAB_ADDITIONAL_VERSIONS
+#
+# If set, specifies additional versions of Matlab that may be looked for.
+# This variable will be used if :variable:`MATLAB_USER_ROOT` is not set.
+# The variable should be a list of strings, organised by pairs of release
+# name and versions, such as follows::
+#
+# set(MATLAB_ADDITIONAL_VERSIONS
+# "release_name1=corresponding_version1"
+# "release_name2=corresponding_version2"
+# ...
+# )
+#
+# Example::
+#
+# set(MATLAB_ADDITIONAL_VERSIONS
+# "R2013b=8.2"
+# "R2013a=8.1"
+# "R2012b=8.0")
#=============================================================================
-# Copyright 2005-2009 Kitware, Inc.
+# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -27,101 +206,1204 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-set(MATLAB_FOUND 0)
-if(WIN32)
- if(${CMAKE_GENERATOR} MATCHES "Visual Studio 6")
- set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc60")
+set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
+include(FindPackageHandleStandardArgs)
+include(CheckCXXCompilerFlag)
+
+
+# The currently supported versions. Other version can be added by the user by
+# providing MATLAB_ADDITIONAL_VERSIONS
+if(NOT MATLAB_ADDITIONAL_VERSIONS)
+ set(MATLAB_ADDITIONAL_VERSIONS)
+endif()
+
+set(MATLAB_VERSIONS_MAPPING
+ "R2013b=8.2"
+ "R2013a=8.1"
+ "R2012b=8.0"
+ "R2012a=7.14"
+
+ "R2011b=7.13"
+ "R2011a=7.12"
+ "R2010b=7.11"
+
+ ${MATLAB_ADDITIONAL_VERSIONS}
+ )
+
+
+# temporary folder for all Matlab runs
+set(_matlab_temporary_folder ${CMAKE_BINARY_DIR}/Matlab)
+
+if(NOT EXISTS ${_matlab_temporary_folder})
+ file(MAKE_DIRECTORY ${_matlab_temporary_folder})
+endif()
+
+#.rst:
+# .. command:: matlab_get_version_from_release_name
+#
+# Returns the version of Matlab (17.58) from a release name (R2017k)
+macro (matlab_get_version_from_release_name release_name version_name)
+
+ string(REGEX MATCHALL "${release_name}=([0-9]+\\.?[0-9]*)" _matched ${MATLAB_VERSIONS_MAPPING})
+
+ set(${version_name} "")
+ if(NOT _matched STREQUAL "")
+ set(${version_name} ${CMAKE_MATCH_1})
else()
- if(${CMAKE_GENERATOR} MATCHES "Visual Studio 7")
- # Assume people are generally using 7.1,
- # if using 7.0 need to link to: ../extern/lib/win32/microsoft/msvc70
- set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc71")
- else()
- if(${CMAKE_GENERATOR} MATCHES "Borland")
- # Same here, there are also: bcc50 and bcc51 directories
- set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/bcc54")
- else()
- if(MATLAB_FIND_REQUIRED)
- message(FATAL_ERROR "Generator not compatible: ${CMAKE_GENERATOR}")
- endif()
+ message(WARNING "The release name ${release_name} is not registered")
+ endif()
+
+endmacro()
+
+
+
+
+
+#.rst:
+# .. command:: matlab_get_release_name_from_version
+#
+# Returns the release name (R2017k) from the version of Matlab (17.58)
+macro (matlab_get_release_name_from_version version release_name)
+
+ set(${release_name} "")
+ foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+ string(REGEX MATCHALL "(.+)=${version}" _matched ${_var})
+ if(NOT _matched STREQUAL "")
+ set(${release_name} ${CMAKE_MATCH_1})
+ break()
+ endif()
+ endforeach(_var)
+
+ unset(_var)
+ unset(_matched)
+ if(${release_name} STREQUAL "")
+ message(WARNING "The version ${version} is not registered")
+ endif()
+
+endmacro()
+
+
+
+
+
+# extracts all the supported release names (R2017k...) of Matlab
+# internal use
+macro(matlab_get_supported_releases list_releases)
+ set(${list_releases})
+ foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+ string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
+ if(NOT _matched STREQUAL "")
+ list(APPEND ${list_releases} ${CMAKE_MATCH_1})
+ endif()
+ unset(_matched)
+ unset(CMAKE_MATCH_1)
+ endforeach(_var)
+ unset(_var)
+endmacro()
+
+
+
+# extracts all the supported versions of Matlab
+# internal use
+macro(matlab_get_supported_versions list_versions)
+ set(${list_versions})
+ foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+ string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
+ if(NOT _matched STREQUAL "")
+ list(APPEND ${list_versions} ${CMAKE_MATCH_2})
+ endif()
+ unset(_matched)
+ unset(CMAKE_MATCH_1)
+ endforeach(_var)
+ unset(_var)
+endmacro()
+
+
+#.rst:
+# .. command:: matlab_extract_all_installed_versions_from_registry
+#
+# This function parses the registry and founds the Matlab versions that are
+# installed. The found versions are returned in `matlab_versions`.
+# Set `win64` to `TRUE` if the 64 bit version of Matlab should be looked for
+# The returned list contains all versions under
+# ``HKLM\\SOFTWARE\\Mathworks\\MATLAB`` or an empty list in case an error
+# occurred (or nothing found).
+#
+# .. note::
+#
+# Only the versions are provided. No check is made over the existence of the
+# installation referenced in the registry,
+#
+function(matlab_extract_all_installed_versions_from_registry win64 matlab_versions)
+
+ if(NOT CMAKE_HOST_WIN32)
+ message(FATAL_ERROR "This macro can only be called by a windows host (call to reg.exe")
+ endif()
+
+ # list the keys under HKEY_LOCAL_MACHINE\SOFTWARE\mathworks but the call to
+ # reg does not work from cmake, curiously, as is. The command provides the
+ # desired result under the command line though.
+ # Fix: this is because "/reg:64" should appended to the command, otherwise
+ # it gets on the 32 bits software key (curiously again)
+ find_program(MATLAB_REG_EXE_LOCATION "reg")
+
+ # if reg.exe is not found, then it is impossible to use this method.
+ if(NOT MATLAB_REG_EXE_LOCATION)
+ if(MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] reg.exe not found")
+ endif()
+ set(${matlab_versions} "" PARENT_SCOPE)
+ return()
+ endif()
+
+ if(${win64} AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "64")
+ set(APPEND_REG "/reg:64")
+ else()
+ set(APPEND_REG "/reg:32")
+ endif()
+
+ # /reg:64 should be added on 64 bits capable OSs in order to enable the
+ # redirection of 64 bits applications
+ execute_process(
+ COMMAND ${MATLAB_REG_EXE_LOCATION} query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
+ RESULT_VARIABLE resultMatlab
+ OUTPUT_VARIABLE varMatlab
+ ERROR_VARIABLE errMatlab
+ )
+ #message("Matlabs = ${varMatlab} | ${resultMatlab}")
+
+
+ set(matlabs_from_registry)
+ if(${resultMatlab} EQUAL 0)
+
+ string(
+ REGEX MATCHALL "MATLAB\\\\([0-9]+(\\.[0-9]+)?)"
+ matlab_versions_regex ${varMatlab})
+
+ foreach(match IN LISTS matlab_versions_regex)
+ string(
+ REGEX MATCH "MATLAB\\\\(([0-9]+)(\\.([0-9]+))?)"
+ current_match ${match})
+
+ set(_matlab_current_version ${CMAKE_MATCH_1})
+ set(current_matlab_version_major ${CMAKE_MATCH_2})
+ set(current_matlab_version_minor ${CMAKE_MATCH_4})
+ if(NOT current_matlab_version_minor)
+ set(current_matlab_version_minor "0")
endif()
+
+ list(APPEND matlabs_from_registry ${_matlab_current_version})
+ unset(_matlab_current_version)
+ endforeach(match)
+
+ endif()
+
+ set(${matlab_versions} ${matlabs_from_registry} PARENT_SCOPE)
+
+endfunction()
+
+
+
+# (internal)
+macro(extract_matlab_versions_from_registry_brute_force matlab_versions)
+ # get the supported versions
+ set(matlab_supported_versions)
+ matlab_get_supported_versions(matlab_supported_versions)
+
+
+ # this is a manual population of the versions we want to look for
+ # this can be done as is, but preferably with the call to
+ # matlab_get_supported_versions and variable
+
+ # populating the versions we want to look for
+ # set(matlab_supported_versions)
+
+ # # Matlab 7
+ # set(matlab_major 7)
+ # foreach(current_matlab_minor RANGE 4 20)
+ # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
+ # endforeach(current_matlab_minor)
+
+ # # Matlab 8
+ # set(matlab_major 8)
+ # foreach(current_matlab_minor RANGE 0 5)
+ # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
+ # endforeach(current_matlab_minor)
+
+ # # taking into account the possible additional versions provided by the user
+ # if(DEFINED MATLAB_ADDITIONAL_VERSIONS)
+ # list(APPEND matlab_supported_versions MATLAB_ADDITIONAL_VERSIONS)
+ # endif()
+
+
+ # we order from more recent to older
+ list(REMOVE_DUPLICATES matlab_supported_versions)
+ list(SORT matlab_supported_versions)
+ list(REVERSE matlab_supported_versions)
+
+
+ set(${matlab_versions} ${matlab_supported_versions})
+
+
+endmacro()
+
+
+
+
+#.rst:
+# .. command:: matlab_get_all_valid_matlab_roots_from_registry
+#
+# Populates the Matlab root with valid versions of Matlab.
+# The returned matlab_roots is organized in pairs
+# ``(version_number,matlab_root_path)``.
+#
+# ::
+#
+# matlab_get_all_valid_matlab_roots_from_registry(
+# matlab_versions
+# matlab_roots)
+#
+# ``matlab_versions``
+# the versions of each of the Matlab installations
+# ``matlab_roots``
+# the location of each of the Matlab installations
+function(matlab_get_all_valid_matlab_roots_from_registry matlab_versions matlab_roots)
+
+ # The matlab_versions comes either from
+ # extract_matlab_versions_from_registry_brute_force or
+ # matlab_extract_all_installed_versions_from_registry.
+
+
+ set(_matlab_roots_list )
+ foreach(_matlab_current_version ${matlab_versions})
+ get_filename_component(
+ current_MATLAB_ROOT
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\${_matlab_current_version};MATLABROOT]"
+ ABSOLUTE)
+
+ if(EXISTS ${current_MATLAB_ROOT})
+ list(APPEND _matlab_roots_list ${_matlab_current_version} ${current_MATLAB_ROOT})
+ endif()
+
+ endforeach(_matlab_current_version)
+ unset(_matlab_current_version)
+ set(${matlab_roots} ${_matlab_roots_list} PARENT_SCOPE)
+ unset(_matlab_roots_list)
+endfunction()
+
+#.rst:
+# .. command:: matlab_get_mex_suffix
+#
+# Returns the extension of the mex files (the suffixes).
+# This function should not be called before the appropriate Matlab root has
+# been found.
+#
+# ::
+#
+# matlab_get_mex_suffix(
+# matlab_root
+# mex_suffix)
+#
+# ``matlab_root``
+# the root of the Matlab installation
+# ``mex_suffix``
+# the variable name in which the suffix will be returned.
+function(matlab_get_mex_suffix matlab_root mex_suffix)
+
+ # todo setup the extension properly. Currently I do not know if this is
+ # sufficient for all win32 distributions.
+ # there is also CMAKE_EXECUTABLE_SUFFIX that could be tweaked
+ set(mexext_suffix "")
+ if(WIN32)
+ list(APPEND mexext_suffix ".bat")
+ endif()
+
+ # we first try without suffix, since cmake does not understand a list with
+ # one empty string element
+ find_program(
+ MATLAB_MEXEXTENSIONS_PROG
+ "mexext"
+ PATHS ${matlab_root}/bin
+ DOC "Matlab MEX extension provider"
+ NO_DEFAULT_PATH
+ )
+
+ foreach(current_mexext_suffix IN LISTS mexext_suffix)
+ if(NOT DEFINED MATLAB_MEXEXTENSIONS_PROG OR NOT MATLAB_MEXEXTENSIONS_PROG)
+ # this call should populate the cache automatically
+ find_program(
+ MATLAB_MEXEXTENSIONS_PROG
+ "mexext${current_mexext_suffix}"
+ PATHS ${matlab_root}/bin
+ DOC "Matlab MEX extension provider"
+ NO_DEFAULT_PATH
+ )
endif()
+ endforeach(current_mexext_suffix)
+
+
+ # the program has been found?
+ if((NOT MATLAB_MEXEXTENSIONS_PROG) OR (NOT EXISTS ${MATLAB_MEXEXTENSIONS_PROG}))
+ if(MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] Cannot found mexext program. Matlab root is ${matlab_root}")
+ endif()
+ return()
endif()
- find_library(MATLAB_MEX_LIBRARY
- libmex
- ${MATLAB_ROOT}
+
+ set(_matlab_mex_extension)
+
+
+ execute_process(
+ COMMAND ${MATLAB_MEXEXTENSIONS_PROG}
+ OUTPUT_VARIABLE _matlab_mex_extension)
+ string(STRIP ${_matlab_mex_extension} _matlab_mex_extension)
+
+ set(${mex_suffix} ${_matlab_mex_extension} PARENT_SCOPE)
+endfunction()
+
+
+
+
+#.rst:
+# .. command:: matlab_get_version_from_matlab_run
+#
+# This function runs Matlab program specified on arguments and extracts its
+# version.
+#
+# ::
+#
+# matlab_get_version_from_matlab_run(
+# matlab_binary_path
+# matlab_list_versions)
+#
+# ``matlab_binary_path``
+# the location of the `matlab` binary executable
+# ``matlab_list_versions``
+# the version extracted from Matlab
+function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_versions)
+
+ set(${matlab_list_versions} "" PARENT_SCOPE)
+
+
+ if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] Determining the version of Matlab from ${matlab_binary_program}")
+ endif()
+
+ if(EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+ if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] Removing previous ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp file")
+ endif()
+ file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+ endif()
+
+
+ # the log file is needed since on windows the command executes in a new
+ # window and it is not possible to get back the answer of Matlab
+ # the -wait command is needed on windows, otherwise the call returns
+ # immediately after the program launches itself.
+ if(WIN32)
+ set(_matlab_additional_commands "-wait")
+ endif()
+
+ # timeout set to 30 seconds, in case it does not start
+ # note as said before OUTPUT_VARIABLE cannot be used in a platform
+ # independent manner however, not setting it would flush the output of Matlab
+ # in the current console (unix variant)
+ execute_process(
+ COMMAND ${matlab_binary_program} -nosplash -nojvm ${_matlab_additional_commands} -logfile ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp -nodesktop -nodisplay -r "version, exit"
+ OUTPUT_VARIABLE _matlab_version_from_cmd_dummy
+ RESULT_VARIABLE _matlab_result_version_call
+ TIMEOUT 30
)
- find_library(MATLAB_MX_LIBRARY
- libmx
- ${MATLAB_ROOT}
+
+
+ if(${_matlab_result_version_call})
+ if(MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call returned with error ${_matlab_result_version_call}.")
+ endif()
+ return()
+ elseif(NOT EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+ if(MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] Unable to determine the version of Matlab. The log file does not exist.")
+ endif()
+ return()
+ endif()
+
+ # if successful, read back the log
+ file(READ ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp _matlab_version_from_cmd)
+ file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+
+ set(index -1)
+ string(FIND ${_matlab_version_from_cmd} "ans" index)
+ if(index EQUAL -1)
+
+ if(MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] Cannot find the version of Matlab returned by the run.")
+ endif()
+
+ else()
+ set(matlab_list_of_all_versions_tmp)
+
+ string(SUBSTRING ${_matlab_version_from_cmd} ${index} -1 substring_ans)
+ string(
+ REGEX MATCHALL "ans[\r\n\t ]*=[\r\n\t ]*([0-9]+(\\.[0-9]+)?)"
+ matlab_versions_regex
+ ${substring_ans})
+ foreach(match IN LISTS matlab_versions_regex)
+ string(
+ REGEX MATCH "ans[\r\n\t ]*=[\r\n\t ]*(([0-9]+)(\\.([0-9]+))?)"
+ current_match ${match})
+
+ list(APPEND matlab_list_of_all_versions_tmp ${CMAKE_MATCH_1})
+ endforeach()
+ list(REMOVE_DUPLICATES matlab_list_of_all_versions_tmp)
+ set(${matlab_list_versions} ${matlab_list_of_all_versions_tmp} PARENT_SCOPE)
+
+ endif()
+
+endfunction()
+
+
+#.rst:
+# .. command:: matlab_add_unit_test
+#
+# Adds a Matlab unit test to the test set of cmake/ctest.
+# This command requires the component ``MAIN_PROGRAM``.
+# The unit test uses the Matlab unittest framework (default, available
+# starting Matlab 2013b+) except if the option ``NO_UNITTEST_FRAMEWORK``
+# is given.
+#
+# The function expects one Matlab test script file to be given.
+# In the case ``NO_UNITTEST_FRAMEWORK`` is given, the unittest script file
+# should contain the script to be run, plus an exit command with the exit
+# value. This exit value will be passed to the ctest framework (0 success,
+# non 0 failure). Additional arguments accepted by :command:`add_test` can be
+# passed through ``TEST_ARGS`` (eg. ``CONFIGURATION <config> ...``).
+#
+# ::
+#
+# matlab_add_unit_test(
+# NAME <name>
+# UNITTEST_FILE matlab_file_containing_unittest.m
+# [UNITTEST_PRECOMMAND matlab_command_to_run]
+# [TIMEOUT timeout]
+# [ADDITIONAL_PATH path1 [path2 ...]]
+# [MATLAB_ADDITIONAL_STARTUP_OPTIONS option1 [option2 ...]]
+# [TEST_ARGS arg1 [arg2 ...]]
+# [NO_UNITTEST_FRAMEWORK]
+# )
+#
+# The function arguments are:
+#
+# ``NAME``
+# name of the unittest in ctest.
+# ``UNITTEST_FILE``
+# the matlab unittest file. Its path will be automatically
+# added to the Matlab path.
+# ``UNITTEST_PRECOMMAND``
+# Matlab script command to be ran before the file
+# containing the test (eg. GPU device initialisation based on CMake
+# variables).
+# ``TIMEOUT``
+# the test timeout in seconds. Defaults to 180 seconds as the
+# Matlab unit test may hang.
+# ``ADDITIONAL_PATH``
+# a list of paths to add to the Matlab path prior to
+# running the unit test.
+# ``MATLAB_ADDITIONAL_STARTUP_OPTIONS``
+# a list of additional option in order
+# to run Matlab from the command line.
+# ``TEST_ARGS``
+# Additional options provided to the add_test command. These
+# options are added to the default options (eg. "CONFIGURATIONS Release")
+# ``NO_UNITTEST_FRAMEWORK``
+# when set, indicates that the test should not
+# use the unittest framework of Matlab (available for versions >= R2013a).
+#
+function(matlab_add_unit_test)
+
+ if(NOT Matlab_MAIN_PROGRAM)
+ message(FATAL_ERROR "[MATLAB] This functionality needs the MAIN_PROGRAM component (not default)")
+ endif()
+
+ set(options NO_UNITTEST_FRAMEWORK)
+ set(oneValueArgs NAME UNITTEST_PRECOMMAND UNITTEST_FILE TIMEOUT)
+ set(multiValueArgs ADDITIONAL_PATH MATLAB_ADDITIONAL_STARTUP_OPTIONS TEST_ARGS)
+
+ set(prefix _matlab_unittest_prefix)
+ cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+
+ if(NOT ${prefix}_NAME)
+ message(FATAL_ERROR "[MATLAB] The Matlab test name cannot be empty")
+ endif()
+
+ add_test(NAME ${${prefix}_NAME}
+ COMMAND ${CMAKE_COMMAND}
+ -Dtest_name=${${prefix}_NAME}
+ -Dadditional_paths=${${prefix}_ADDITIONAL_PATH}
+ -Dtest_timeout=${${prefix}_TIMEOUT}
+ -Doutput_directory=${_matlab_temporary_folder}
+ -DMatlab_PROGRAM=${Matlab_MAIN_PROGRAM}
+ -Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}
+ -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}
+ -Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}
+ -Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}
+ -P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
+ ${${prefix}_TEST_ARGS}
+ ${${prefix}_UNPARSED_ARGUMENTS}
+ )
+endfunction()
+
+
+#.rst:
+# .. command:: matlab_add_mex
+#
+# Adds a Matlab MEX target.
+# This commands compiles the given sources with the current tool-chain in
+# order to produce a MEX file. The final name of the produced output may be
+# specified, as well as additional link libraries, and a documentation entry
+# for the MEX file. Remaining arguments of the call are passed to the
+# :command:`add_library` command.
+#
+# ::
+#
+# matlab_add_mex(
+# NAME <name>
+# SRC src1 [src2 ...]
+# [OUTPUT_NAME output_name]
+# [DOCUMENTATION file.txt]
+# [LINK_TO target1 target2 ...]
+# [...]
+# )
+#
+# ``NAME``
+# name of the target.
+# ``SRC``
+# list of tje source files.
+# ``LINK_TO``
+# a list of additional link dependencies. The target links to ``libmex``
+# by default. If ``Matlab_MX_LIBRARY`` is defined, it also
+# links to ``libmx``.
+# ``OUTPUT_NAME``
+# if given, overrides the default name. The default name is
+# the name of the target without any prefix and
+# with ``Matlab_MEX_EXTENSION`` suffix.
+# ``DOCUMENTATION``
+# if given, the file ``file.txt`` will be considered as
+# being the documentation file for the MEX file. This file is copied into
+# the same folder without any processing, with the same name as the final
+# mex file, and with extension `.m`. In that case, typing ``help <name>``
+# in Matlab prints the documentation contained in this file.
+#
+# The documentation file is not processed and should be in the following
+# format:
+#
+# ::
+#
+# % This is the documentation
+# function ret = mex_target_output_name(input1)
+#
+function(matlab_add_mex )
+
+ if(NOT WIN32)
+ # we do not need all this on Windows
+ # pthread options
+ check_cxx_compiler_flag(-pthread HAS_MINUS_PTHREAD)
+ # we should use try_compile instead, the link flags are discarded from
+ # this compiler_flag function.
+ #check_cxx_compiler_flag(-Wl,--exclude-libs,ALL HAS_SYMBOL_HIDING_CAPABILITY)
+
+ endif()
+
+ set(oneValueArgs NAME DOCUMENTATION OUTPUT_NAME)
+ set(multiValueArgs LINK_TO SRC)
+
+ set(prefix _matlab_addmex_prefix)
+ cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+
+ if(NOT ${prefix}_NAME)
+ message(FATAL_ERROR "[MATLAB] The MEX target name cannot be empty")
+ endif()
+
+ if(NOT ${prefix}_OUTPUT_NAME)
+ set(${prefix}_OUTPUT_NAME ${${prefix}_NAME})
+ endif()
+
+ add_library(${${prefix}_NAME}
+ SHARED
+ ${${prefix}_SRC}
+ ${${prefix}_DOCUMENTATION}
+ ${${prefix}_UNPARSED_ARGUMENTS})
+ target_include_directories(${${prefix}_NAME} PRIVATE ${Matlab_INCLUDE_DIRS})
+
+ if(DEFINED Matlab_MX_LIBRARY)
+ target_link_libraries(${${prefix}_NAME} ${Matlab_MX_LIBRARY})
+ endif()
+
+ target_link_libraries(${${prefix}_NAME} ${Matlab_MEX_LIBRARY} ${${prefix}_LINK_TO})
+ set_target_properties(${${prefix}_NAME}
+ PROPERTIES
+ PREFIX ""
+ OUTPUT_NAME ${${prefix}_OUTPUT_NAME}
+ SUFFIX ".${Matlab_MEX_EXTENSION}")
+
+
+ # documentation
+ if(NOT ${${prefix}_DOCUMENTATION} STREQUAL "")
+ get_target_property(output_name ${${prefix}_NAME} OUTPUT_NAME)
+ add_custom_command(
+ TARGET ${${prefix}_NAME}
+ PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${${prefix}_DOCUMENTATION} $<TARGET_FILE_DIR:${${prefix}_NAME}>/${output_name}.m
+ COMMENT "Copy ${${prefix}_NAME} documentation file into the output folder"
)
- find_library(MATLAB_ENG_LIBRARY
- libeng
- ${MATLAB_ROOT}
+ endif() # documentation
+
+ # entry point in the mex file + taking care of visibility and symbol clashes.
+ if(WIN32)
+ set_target_properties(${${prefix}_NAME}
+ PROPERTIES
+ DEFINE_SYMBOL "DLL_EXPORT_SYM=__declspec(dllexport)")
+ else()
+
+ if(HAS_MINUS_PTHREAD AND NOT APPLE)
+ # Apparently, compiling with -pthread generated the proper link flags
+ # and some defines at compilation
+ target_compile_options(${${prefix}_NAME} PRIVATE "-pthread")
+ endif()
+
+
+ # if we do not do that, the symbols linked from eg. boost remain weak and
+ # then clash with the ones defined in the matlab process. So by default
+ # the symbols are hidden.
+ # This also means that for shared libraries (like MEX), the entry point
+ # should be explicitly declared with default visibility, otherwise Matlab
+ # cannot find the entry point.
+ # Note that this is particularly meaningful if the MEX wrapper itself
+ # contains symbols that are clashing with Matlab (that are compiled in the
+ # MEX file). In order to propagate the visibility options to the libraries
+ # to which the MEX file is linked against, the -Wl,--exclude-libs,ALL
+ # option should also be specified.
+
+ set_target_properties(${${prefix}_NAME}
+ PROPERTIES
+ CXX_VISIBILITY_PRESET "hidden"
+ C_VISIBILITY_PRESET "hidden"
+ VISIBILITY_INLINES_HIDDEN "hidden"
)
- find_path(MATLAB_INCLUDE_DIR
- "mex.h"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/include"
+ # get_target_property(
+ # _previous_link_flags
+ # ${${prefix}_NAME}
+ # LINK_FLAGS)
+ # if(NOT _previous_link_flags)
+ # set(_previous_link_flags)
+ # endif()
+
+ # if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ # set_target_properties(${${prefix}_NAME}
+ # PROPERTIES
+ # LINK_FLAGS "${_previous_link_flags} -Wl,--exclude-libs,ALL"
+ # # -Wl,--version-script=${_FindMatlab_SELF_DIR}/MatlabLinuxVisibility.map"
+ # )
+ # elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ # # in this case, all other symbols become hidden.
+ # set_target_properties(${${prefix}_NAME}
+ # PROPERTIES
+ # LINK_FLAGS "${_previous_link_flags} -Wl,-exported_symbol,_mexFunction"
+ # #-Wl,-exported_symbols_list,${_FindMatlab_SELF_DIR}/MatlabOSXVisilibity.map"
+ # )
+ # endif()
+
+
+
+ set_target_properties(${${prefix}_NAME}
+ PROPERTIES
+ DEFINE_SYMBOL "DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))"
)
+
+
+ endif()
+
+endfunction()
+
+
+
+
+
+
+
+
+# this variable will get all Matlab installations found in the current system.
+set(_matlab_possible_roots)
+
+
+# listing the Matlab versions installed on the WIN machine if MATLAB_USER_ROOT
+# is not set
+if(WIN32)
+
+ # for windows
+
+
+ if(NOT MATLAB_USER_ROOT)
+ # if MATLAB_USER_ROOT not specified, we look for Matlab installation in
+ # the registry
+ # if unsuccessful, we look for all known revision and filter the existing
+ # ones.
+
+ # testing if we are able to extract the needed information from the registry
+ set(matlab_versions_from_registry)
+ matlab_extract_all_installed_versions_from_registry(CMAKE_CL_64 matlab_versions_from_registry)
+
+ # the returned list is empty, doing the search on all known versions
+ if(NOT matlab_versions_from_registry)
+
+ if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] Search for Matlab from the registry unsuccessful, testing all supported versions")
+ endif()
+
+ extract_matlab_versions_from_registry_brute_force(matlab_versions_from_registry)
+ endif()
+
+ # filtering the results with the registry keys
+ matlab_get_all_valid_matlab_roots_from_registry("${matlab_versions_from_registry}" _matlab_possible_roots)
+
+
+
+ elseif(NOT EXISTS ${MATLAB_USER_ROOT})
+
+ # if MATLAB_USER_ROOT specified but erroneous
+ if(MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
+ endif()
+ else()
+ list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
+ endif()
+
+
else()
- if(CMAKE_SIZEOF_VOID_P EQUAL 4)
- # Regular x86
- set(MATLAB_ROOT
- /usr/local/matlab-7sp1/bin/glnx86/
- /opt/matlab-7sp1/bin/glnx86/
- $ENV{HOME}/matlab-7sp1/bin/glnx86/
- $ENV{HOME}/redhat-matlab/bin/glnx86/
- )
+ # for linux/osx
+
+ if(NOT MATLAB_USER_ROOT)
+
+ # if MATLAB_USER_ROOT not specified, we look for Matlab from the command
+ # line PATH
+ # maybe using CMAKE_PROGRAM_PATH to add some more hints
+
+ set(_matlab_main_tmp "")
+ if(Matlab_MAIN_PROGRAM)
+ set(_matlab_main_tmp ${Matlab_MAIN_PROGRAM})
+ endif()
+
+ if(NOT _matlab_main_tmp)
+ # if we get there a second time and the folder matlab is created here,
+ # and then the find_program does not find it,
+ # the get_filename_component (... PROGRAM) finds this directory instead.
+ find_program(
+ _matlab_main_tmp
+ "matlab")
+
+ if(NOT _matlab_main_tmp)
+ #execute_process(COMMAND which matlab OUTPUT_VARIABLE _which_matlab
+ # RESULT_VARIABLE _which_matlab_result)
+ get_filename_component(_matlab_main_tmp "matlab" PROGRAM)
+
+ # "bug" of cmake: if we call get_filename_component with PROGRAM, it can
+ # return us a directory
+ if((NOT EXISTS ${_matlab_main_tmp}) OR (IS_DIRECTORY ${_matlab_main_tmp}))
+ execute_process(
+ COMMAND "which matlab"
+ OUTPUT_VARIABLE _matlab_main_tmp)
+ endif()
+ endif()
+
+
+ if(EXISTS ${_matlab_main_tmp})
+ if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] matlab found from PATH: ${_matlab_main_tmp}")
+ endif()
+ else()
+ # found candidate is not good, we remove it
+ unset(_matlab_main_tmp)
+ unset(_matlab_main_tmp CACHE)
+ endif()
+
+ endif() # if(NOT _matlab_main_tmp)
+
+ if(_matlab_main_tmp AND EXISTS ${_matlab_main_tmp})
+
+ # resolve symlinks
+ get_filename_component(_matlab_current_location "${_matlab_main_tmp}" REALPATH)
+ set(_directory_alias DIRECTORY)
+
+ # get the directory (the command below has to be run twice)
+ get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias})
+ get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias}) # Matlab should be in bin
+ list(APPEND _matlab_possible_roots "NOTFOUND" ${_matlab_current_location}) # empty version
+ endif()
+
+
+ # on mac, we look for the /Application paths
+ # this corresponds to the behaviour on Windows. On Linux, we do not have
+ # any other guess.
+ if((NOT _matlab_possible_roots) AND APPLE)
+
+ matlab_get_supported_releases(_matlab_releases)
+ if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] Matlab supported versions ${_matlab_releases}. If more version should be supported "
+ "the variable MATLAB_ADDITIONAL_VERSIONS can be set according to the documentation")
+ endif()
+
+ foreach(_matlab_current_release IN LISTS _matlab_releases)
+ set(_matlab_full_string "/Applications/MATLAB_${_matlab_current_release}.app")
+ if(EXISTS ${_matlab_full_string})
+ set(_matlab_current_version)
+ matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version)
+ if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] Found version ${_matlab_current_release} (${_matlab_current_version}) in ${_matlab_full_string}")
+ endif()
+ list(APPEND _matlab_possible_roots ${_matlab_current_version})
+ list(APPEND _matlab_possible_roots ${_matlab_full_string})
+ unset(_matlab_current_version)
+ endif()
+
+ unset(_matlab_full_string)
+ endforeach(_matlab_current_release)
+ unset(_matlab_current_release)
+ unset(_matlab_releases)
+ endif()
+
+ # we need to clear _matlab_main_tmp here
+ unset(_matlab_main_tmp CACHE)
+ unset(_matlab_main_tmp)
+
+ elseif(NOT EXISTS ${MATLAB_USER_ROOT})
+ # if MATLAB_USER_ROOT specified but erroneous
+ if(MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
+ endif()
else()
- # AMD64:
- set(MATLAB_ROOT
- /usr/local/matlab-7sp1/bin/glnxa64/
- /opt/matlab-7sp1/bin/glnxa64/
- $ENV{HOME}/matlab7_64/bin/glnxa64/
- $ENV{HOME}/matlab-7sp1/bin/glnxa64/
- $ENV{HOME}/redhat-matlab/bin/glnxa64/
- )
+ list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
endif()
- find_library(MATLAB_MEX_LIBRARY
- mex
- ${MATLAB_ROOT}
- )
- find_library(MATLAB_MX_LIBRARY
- mx
- ${MATLAB_ROOT}
- )
- find_library(MATLAB_ENG_LIBRARY
- eng
- ${MATLAB_ROOT}
- )
- find_path(MATLAB_INCLUDE_DIR
- "mex.h"
- "/usr/local/matlab-7sp1/extern/include/"
- "/opt/matlab-7sp1/extern/include/"
- "$ENV{HOME}/matlab-7sp1/extern/include/"
- "$ENV{HOME}/redhat-matlab/extern/include/"
+endif()
+
+
+if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] Matlab root folders are ${_matlab_possible_roots}")
+endif()
+
+
+
+if(DEFINED Matlab_ROOT_DIR)
+ unset(Matlab_ROOT_DIR)
+endif()
+
+# take the first possible Matlab root
+if(_matlab_possible_roots)
+ list(GET _matlab_possible_roots 0 Matlab_VERSION_STRING)
+ list(GET _matlab_possible_roots 1 Matlab_ROOT_DIR)
+ list(LENGTH _matlab_possible_roots numbers_of_matlab_roots)
+
+ # adding a warning in case of ambiguity
+ if(numbers_of_matlab_roots GREATER 2 AND MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] Found several distributions of Matlab. Setting the current version to ${Matlab_VERSION_STRING} (located ${Matlab_ROOT_DIR})."
+ " If this is not the desired behaviour, provide the -DMATLAB_USER_ROOT on the command line")
+ endif()
+endif()
+
+
+if((NOT (DEFINED Matlab_VERSION_STRING)) OR (NOT Matlab_VERSION_STRING))
+ set(Matlab_VERSION_STRING "NOTFOUND")
+endif()
+
+
+
+# if the version is not trivial, we query matlab for that
+# we keep track of the location of matlab that induced this version
+set(Matlab_VERSION_STRING_AUTO_DETECT "" CACHE INTERNAL "internal matlab location for the discovered version")
+
+set(_matlab_version_should_be_recomputed FALSE)
+if(${Matlab_VERSION_STRING} STREQUAL "NOTFOUND")
+ set(_matlab_version_should_be_recomputed TRUE)
+elseif((NOT Matlab_MAIN_PROGRAM) OR (NOT EXISTS ${Matlab_MAIN_PROGRAM}))
+ set(_matlab_version_should_be_recomputed TRUE)
+else()
+ # just in case the variable is modified to a symlink
+ get_filename_component(_matlab_main_tmp "${Matlab_MAIN_PROGRAM}" REALPATH)
+ if(NOT (_matlab_main_tmp STREQUAL Matlab_VERSION_STRING_AUTO_DETECT))
+ set(_matlab_version_should_be_recomputed TRUE)
+ endif()
+endif()
+
+if(_matlab_version_should_be_recomputed)
+ if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] querying for version from Matlab root = ${Matlab_ROOT_DIR}")
+ endif()
+
+ if(NOT Matlab_MAIN_PROGRAM)
+ set(_matlab_main_tmp ${Matlab_MAIN_PROGRAM})
+ else()
+ find_program(
+ _matlab_main_tmp
+ matlab
+ PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
+ DOC "Matlab main program"
+ NO_DEFAULT_PATH
)
+ endif()
+
+ if(_matlab_main_tmp)
+ set(matlab_list_of_all_versions)
+ matlab_get_version_from_matlab_run(${_matlab_main_tmp} matlab_list_of_all_versions)
+
+ list(GET matlab_list_of_all_versions 0 MATLAB_VERSION_tmp)
+ # set the version into the cache
+ set(Matlab_VERSION_STRING ${MATLAB_VERSION_tmp} CACHE INTERNAL "Matlab version (automatically determined)" FORCE)
+ list(LENGTH list_of_all_versions list_of_all_versions_length)
+ if((${list_of_all_versions_length} GREATER 1) AND MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] Found several versions, taking the first one (versions found ${list_of_all_versions})")
+ endif()
+
+ # update the location of Matlab that produced this value
+ # we store the real path for comparison
+ get_filename_component(_matlab_main_tmp1 "${_matlab_main_tmp}" REALPATH)
+ set(Matlab_VERSION_STRING_AUTO_DETECT ${_matlab_main_tmp1} CACHE INTERNAL "internal matlab location for the discovered version" FORCE)
+
+ # these are internal variables
+ unset(_matlab_main_tmp)
+ unset(_matlab_main_tmp CACHE)
+ unset(_matlab_main_tmp1)
+ endif()
endif()
-# This is common to UNIX and Win32:
-set(MATLAB_LIBRARIES
- ${MATLAB_MEX_LIBRARY}
- ${MATLAB_MX_LIBRARY}
- ${MATLAB_ENG_LIBRARY}
-)
-if(MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES)
- set(MATLAB_FOUND 1)
+if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] Current version is ${Matlab_VERSION_STRING} located ${Matlab_ROOT_DIR}")
+endif()
+
+
+
+if(Matlab_ROOT_DIR)
+ file(TO_CMAKE_PATH ${Matlab_ROOT_DIR} Matlab_ROOT_DIR)
+endif()
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ set(_matlab_64Build FALSE)
+else()
+ set(_matlab_64Build TRUE)
+endif()
+
+if(APPLE)
+ set(_matlab_bin_prefix "mac") # i should be for intel
+ set(_matlab_bin_suffix_32bits "i")
+ set(_matlab_bin_suffix_64bits "i64")
+elseif(UNIX)
+ set(_matlab_bin_prefix "gln")
+ set(_matlab_bin_suffix_32bits "x86")
+ set(_matlab_bin_suffix_64bits "xa64")
+else()
+ set(_matlab_bin_prefix "win")
+ set(_matlab_bin_suffix_32bits "32")
+ set(_matlab_bin_suffix_64bits "64")
+endif()
+
+
+
+set(MATLAB_INCLUDE_DIR_TO_LOOK ${Matlab_ROOT_DIR}/extern/include)
+if(_matlab_64Build)
+ set(_matlab_current_suffix ${_matlab_bin_suffix_64bits})
+else()
+ set(_matlab_current_suffix ${_matlab_bin_suffix_32bits})
endif()
-mark_as_advanced(
- MATLAB_LIBRARIES
- MATLAB_MEX_LIBRARY
- MATLAB_MX_LIBRARY
- MATLAB_ENG_LIBRARY
- MATLAB_INCLUDE_DIR
- MATLAB_FOUND
- MATLAB_ROOT
+set(Matlab_BINARIES_DIR
+ ${Matlab_ROOT_DIR}/bin/${_matlab_bin_prefix}${_matlab_current_suffix})
+set(Matlab_EXTERN_LIBRARY_DIR
+ ${Matlab_ROOT_DIR}/extern/lib/${_matlab_bin_prefix}${_matlab_current_suffix})
+
+if(WIN32)
+ set(_matlab_lib_dir_for_search ${Matlab_EXTERN_LIBRARY_DIR}/microsoft)
+ set(_matlab_lib_prefix_for_search "lib")
+else()
+ set(_matlab_lib_dir_for_search ${Matlab_BINARIES_DIR})
+ set(_matlab_lib_prefix_for_search "lib")
+endif()
+
+unset(_matlab_64Build)
+
+
+if(NOT DEFINED Matlab_MEX_EXTENSION)
+ set(_matlab_mex_extension "")
+ matlab_get_mex_suffix("${Matlab_ROOT_DIR}" _matlab_mex_extension)
+
+ # This variable goes to the cache.
+ set(Matlab_MEX_EXTENSION ${_matlab_mex_extension} CACHE STRING "Extensions for the mex targets (automatically given by Matlab)")
+ unset(_matlab_mex_extension)
+endif()
+
+
+if(MATLAB_FIND_DEBUG)
+ message(STATUS "[MATLAB] [DEBUG]_matlab_lib_prefix_for_search = ${_matlab_lib_prefix_for_search} | _matlab_lib_dir_for_search = ${_matlab_lib_dir_for_search}")
+endif()
+
+
+
+# internal
+# This small stub around find_library is to prevent any pollution of CMAKE_FIND_LIBRARY_PREFIXES in the global scope.
+# This is the function to be used below instead of the find_library directives.
+function(_Matlab_find_library _matlab_library_prefix)
+ set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} ${_matlab_library_prefix})
+ find_library(${ARGN})
+endfunction()
+
+
+set(_matlab_required_variables)
+
+
+# the MEX library/header are required
+find_path(
+ Matlab_INCLUDE_DIRS
+ mex.h
+ PATHS ${MATLAB_INCLUDE_DIR_TO_LOOK}
+ NO_DEFAULT_PATH
+ )
+list(APPEND _matlab_required_variables Matlab_INCLUDE_DIRS)
+
+_Matlab_find_library(
+ ${_matlab_lib_prefix_for_search}
+ Matlab_MEX_LIBRARY
+ mex
+ PATHS ${_matlab_lib_dir_for_search}
+ NO_DEFAULT_PATH
)
+
+
+list(APPEND _matlab_required_variables Matlab_MEX_LIBRARY)
+
+# the MEX extension is required
+list(APPEND _matlab_required_variables Matlab_MEX_EXTENSION)
+
+# the matlab root is required
+list(APPEND _matlab_required_variables Matlab_ROOT_DIR)
+
+
+# component Mex Compiler
+list(FIND Matlab_FIND_COMPONENTS MEX_COMPILER _matlab_find_mex_compiler)
+if(_matlab_find_mex_compiler GREATER -1)
+ find_program(
+ Matlab_MEX_COMPILER
+ "mex"
+ PATHS ${Matlab_BINARIES_DIR}
+ DOC "Matlab MEX compiler"
+ NO_DEFAULT_PATH
+ )
+
+ if(Matlab_MEX_COMPILER)
+ set(Matlab_MEX_COMPILER_FOUND TRUE)
+ endif()
+endif()
+unset(_matlab_find_mex_compiler)
+
+# component Matlab program
+list(FIND Matlab_FIND_COMPONENTS MAIN_PROGRAM _matlab_find_matlab_program)
+if(_matlab_find_matlab_program GREATER -1)
+ # todo cleanup with code above
+ if(NOT DEFINED Matlab_MAIN_PROGRAM)
+ find_program(
+ Matlab_MAIN_PROGRAM
+ matlab
+ PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
+ DOC "Matlab main program"
+ NO_DEFAULT_PATH
+ )
+ endif()
+ if(Matlab_MAIN_PROGRAM)
+ set(Matlab_MAIN_PROGRAM_FOUND TRUE)
+ endif()
+
+endif()
+unset(_matlab_find_matlab_program)
+
+# Component MX library
+list(FIND Matlab_FIND_COMPONENTS MX_LIBRARY _matlab_find_mx)
+if(_matlab_find_mx GREATER -1)
+ _Matlab_find_library(
+ ${_matlab_lib_prefix_for_search}
+ Matlab_MX_LIBRARY
+ mx
+ PATHS ${_matlab_lib_dir_for_search}
+ NO_DEFAULT_PATH
+ )
+
+ if(Matlab_MX_LIBRARY)
+ set(Matlab_MX_LIBRARY_FOUND TRUE)
+ endif()
+endif()
+unset(_matlab_find_mx)
+
+
+# Component ENG library
+list(FIND Matlab_FIND_COMPONENTS ENG_LIBRARY _matlab_find_eng)
+if(_matlab_find_eng GREATER -1)
+ _Matlab_find_library(
+ ${_matlab_lib_prefix_for_search}
+ Matlab_ENG_LIBRARY
+ eng
+ PATHS ${_matlab_lib_dir_for_search}
+ NO_DEFAULT_PATH
+ )
+ if(Matlab_ENG_LIBRARY)
+ set(Matlab_ENG_LIBRARY_FOUND TRUE)
+ endif()
+endif()
+unset(_matlab_find_eng)
+
+
+
+
+
+unset(_matlab_lib_dir_for_search)
+
+
+set(Matlab_LIBRARIES ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} ${Matlab_ENG_LIBRARY})
+
+if(CMAKE_VERSION VERSION_LESS "2.8.11")
+ find_package_handle_standard_args(
+ Matlab
+ REQUIRED_VARS ${_matlab_required_variables}
+ VERSION_VAR Matlab_VERSION_STRING)
+else()
+ find_package_handle_standard_args(
+ Matlab
+ FOUND_VAR Matlab_FOUND
+ REQUIRED_VARS ${_matlab_required_variables} #MATLAB_REQUIRED_PROGRAMS MATLAB_REQUIRED_LIBRARIES MATLAB_REQUIRED_INCLUDE_DIRS
+ VERSION_VAR Matlab_VERSION_STRING
+ HANDLE_COMPONENTS)
+endif()
+
+unset(_matlab_required_variables)
+unset(_matlab_bin_prefix)
+unset(_matlab_bin_suffix_32bits)
+unset(_matlab_bin_suffix_64bits)
+unset(_matlab_current_suffix)
+unset(_matlab_lib_dir_for_search)
+unset(_matlab_lib_prefix_for_search)
+
+if(Matlab_INCLUDE_DIRS AND Matlab_LIBRARIES)
+ mark_as_advanced(
+ Matlab_LIBRARIES
+ Matlab_MEX_LIBRARY
+ Matlab_MX_LIBRARY
+ Matlab_ENG_LIBRARY
+ Matlab_INCLUDE_DIRS
+ Matlab_FOUND
+ MATLAB_USER_ROOT
+ Matlab_ROOT_DIR
+ Matlab_VERSION_STRING
+ Matlab_MAIN_PROGRAM
+ Matlab_MEX_EXTENSION
+ Matlab_BINARIES_DIR
+ )
+endif()
diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
new file mode 100644
index 0000000..46d1ef8
--- /dev/null
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -0,0 +1,83 @@
+# This is an undocumented internal helper for the FindMatlab
+# module ``matlab_add_unit_test`` command.
+
+#=============================================================================
+# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+
+# Usage: cmake
+# -Dtest_timeout=180
+# -Dworking_directory="."
+# -Doutput_directory=
+# -Dadditional_paths=""
+# -Dno_unittest_framework=""
+# -DMatlab_PROGRAM=matlab_exe_location
+# -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=""
+# -Dtest_name=name_of_the_test
+# -Dcmd_to_run_before_test=""
+# -Dunittest_file_to_run
+# -P FindMatlab_TestsRedirect.cmake
+
+set(Matlab_UNIT_TESTS_CMD -nosplash -nojvm -nodesktop -nodisplay ${Matlab_ADDITIONNAL_STARTUP_OPTIONS})
+if(WIN32)
+ set(Matlab_UNIT_TESTS_CMD ${Matlab_UNIT_TESTS_CMD} -wait)
+endif()
+
+if(NOT test_timeout)
+ set(test_timeout 180)
+endif()
+
+if(NOT cmd_to_run_before_test)
+ set(cmd_to_run_before_test)
+endif()
+
+get_filename_component(unittest_file_directory "${unittest_file_to_run}" DIRECTORY)
+get_filename_component(unittest_file_to_run_name "${unittest_file_to_run}" NAME_WE)
+
+set(concat_string '${unittest_file_directory}')
+foreach(s IN LISTS additional_paths)
+ if(NOT "${s}" STREQUAL "")
+ set(concat_string "${concat_string}, '${s}'")
+ endif()
+endforeach()
+
+set(unittest_to_run "runtests('${unittest_file_to_run_name}'), exit(max([ans(1,:).Failed]))")
+if(no_unittest_framework)
+ set(unittest_to_run "try, ${unittest_file_to_run_name}, catch err, disp('An exception has been thrown during the execution'), disp(err), disp(err.stack), exit(1), end, exit(0)")
+endif()
+
+set(Matlab_SCRIPT_TO_RUN
+ "addpath(${concat_string}), path, ${cmd_to_run_before_test}, ${unittest_to_run}"
+ )
+
+set(Matlab_LOG_FILE ${output_directory}/${test_name}.log)
+
+execute_process(
+ COMMAND ${Matlab_PROGRAM} ${Matlab_UNIT_TESTS_CMD} -logfile ${Matlab_LOG_FILE} -r ${Matlab_SCRIPT_TO_RUN}
+ RESULT_VARIABLE res
+ TIMEOUT ${test_timeout}
+ OUTPUT_QUIET # we do not want the output twice
+ )
+
+if(NOT EXISTS ${Matlab_LOG_FILE})
+ message( FATAL_ERROR "[MATLAB] ERROR: cannot find the log file ${Matlab_LOG_FILE}")
+endif()
+
+# print the output in any case.
+file(READ ${Matlab_LOG_FILE} matlab_log_content)
+message("Matlab test ${name_of_the_test} output:\n${matlab_log_content}") # if we put FATAL_ERROR here, the file is indented.
+
+
+if(NOT (res EQUAL 0))
+ message( FATAL_ERROR "[MATLAB] TEST FAILED" )
+endif()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 703c548..414f625 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1256,6 +1256,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
add_subdirectory(FindJsonCpp)
endif()
+ # Matlab module
+ if(CMake_TEST_FindMatlab)
+ ADD_TEST_MACRO(FindMatlab.basic_checks ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
+ ADD_TEST_MACRO(FindMatlab.versions_checks ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
+ endif()
+
find_package(GTK2 QUIET)
if(GTK2_FOUND)
add_subdirectory(FindGTK2)
diff --git a/Tests/FindMatlab/basic_checks/CMakeLists.txt b/Tests/FindMatlab/basic_checks/CMakeLists.txt
new file mode 100644
index 0000000..acf71ea
--- /dev/null
+++ b/Tests/FindMatlab/basic_checks/CMakeLists.txt
@@ -0,0 +1,57 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(basic_checks)
+
+set(MATLAB_FIND_DEBUG TRUE)
+
+# the success of the following command is dependent on the current configuration:
+# - on 32bits builds (cmake is building with 32 bits), it looks for 32 bits Matlab
+# - on 64bits builds (cmake is building with 64 bits), it looks for 64 bits Matlab
+find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY MAIN_PROGRAM)
+
+
+
+matlab_add_mex(
+ # target name
+ NAME cmake_matlab_test_wrapper1
+ # output name
+ OUTPUT_NAME cmake_matlab_mex1
+ SRC ${CMAKE_CURRENT_SOURCE_DIR}/../matlab_wrapper1.cpp
+ DOCUMENTATION ${CMAKE_CURRENT_SOURCE_DIR}/../help_text1.m.txt
+ )
+
+
+matlab_add_unit_test(
+ NAME ${PROJECT_NAME}_matlabtest-1
+ TIMEOUT 30
+ UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests1.m
+ ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+ )
+
+matlab_add_unit_test(
+ NAME ${PROJECT_NAME}_matlabtest-2
+ TIMEOUT 15
+ UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests_timeout.m
+ ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+ )
+set_tests_properties(${PROJECT_NAME}_matlabtest-2 PROPERTIES WILL_FAIL TRUE)
+
+
+# testing the test without the unittest framework of Matlab
+matlab_add_unit_test(
+ NAME ${PROJECT_NAME}_matlabtest-3
+ TIMEOUT 30
+ NO_UNITTEST_FRAMEWORK
+ UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests2.m
+ ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+ )
+
+matlab_add_unit_test(
+ NAME ${PROJECT_NAME}_matlabtest-4
+ TIMEOUT 30
+ NO_UNITTEST_FRAMEWORK
+ UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests3.m
+ ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+ )
+set_tests_properties(${PROJECT_NAME}_matlabtest-4 PROPERTIES WILL_FAIL TRUE)
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests1.m b/Tests/FindMatlab/cmake_matlab_unit_tests1.m
new file mode 100644
index 0000000..2371c3a
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests1.m
@@ -0,0 +1,33 @@
+
+classdef cmake_matlab_unit_tests1 < matlab.unittest.TestCase
+ % some simple unit test for CMake Matlab wrapper
+ properties
+ end
+
+ methods (Test)
+ function testDummyCall(testCase)
+ % very simple call test
+ cmake_matlab_mex1(rand(3,3));
+ end
+
+ function testDummyCall2(testCase)
+ % very simple call test 2
+ ret = cmake_matlab_mex1(rand(3,3));
+ testCase.verifyEqual(size(ret), size(rand(3,3)));
+
+ testCase.verifyEqual(size(cmake_matlab_mex1(rand(4,3))), [4,3] );
+ end
+
+ function testFailTest(testCase)
+ testCase.verifyError(@() cmake_matlab_mex1(10), 'cmake_matlab:configuration');
+ testCase.verifyError(@() cmake_matlab_mex1([10]), 'cmake_matlab:configuration');
+ end
+
+ function testHelpContent(testCase)
+ % testing the help feature
+ testCase.verifySubstring(evalc('help cmake_matlab_mex1'), 'Dummy matlab extension in cmake');
+ end
+
+
+ end
+end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/FindMatlab/cmake_matlab_unit_tests2.m
new file mode 100644
index 0000000..7a8a342
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests2.m
@@ -0,0 +1,6 @@
+
+ret = cmake_matlab_mex1(rand(3,3));
+
+if(size(ret) ~= size(rand(3,3)))
+ error('Dimension mismatch!');
+end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests3.m b/Tests/FindMatlab/cmake_matlab_unit_tests3.m
new file mode 100644
index 0000000..2639325
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests3.m
@@ -0,0 +1,5 @@
+
+cmake_matlab_mex1(10);
+
+% should not reach this point
+exit(0);
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
new file mode 100644
index 0000000..66be1bb
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
@@ -0,0 +1,15 @@
+
+classdef cmake_matlab_unit_tests_timeout < matlab.unittest.TestCase
+ % timeout tests
+
+ properties
+ end
+
+ methods (Test)
+ function testCallHangsShouldBeTimedOut(testCase)
+ cmake_matlab_mex1(rand(3,3));
+ disp('Will now wait.');
+ input('Testing the cmake Matlab package timeout - do not press anything');
+ end
+ end
+end
diff --git a/Tests/FindMatlab/help_text1.m.txt b/Tests/FindMatlab/help_text1.m.txt
new file mode 100644
index 0000000..a924355
--- /dev/null
+++ b/Tests/FindMatlab/help_text1.m.txt
@@ -0,0 +1,2 @@
+% Dummy matlab extension in cmake
+function ret = cmake_matlab_mex1(X)
diff --git a/Tests/FindMatlab/matlab_wrapper1.cpp b/Tests/FindMatlab/matlab_wrapper1.cpp
new file mode 100644
index 0000000..4149bb9
--- /dev/null
+++ b/Tests/FindMatlab/matlab_wrapper1.cpp
@@ -0,0 +1,26 @@
+
+// simple workaround to some compiler specific problems
+// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
+#include <algorithm>
+
+#include "mex.h"
+
+// this test should return a matrix of 10 x 10 and should check some of the arguments
+
+void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
+{
+ if(nrhs != 1)
+ {
+ mexErrMsgTxt("Incorrect arguments");
+ }
+
+ size_t dim1 = mxGetM(prhs[0]);
+ size_t dim2 = mxGetN(prhs[0]);
+
+ if(dim1 == 1 || dim2 == 1)
+ {
+ mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
+ }
+
+ plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
+}
diff --git a/Tests/FindMatlab/versions_checks/CMakeLists.txt b/Tests/FindMatlab/versions_checks/CMakeLists.txt
new file mode 100644
index 0000000..5d20685
--- /dev/null
+++ b/Tests/FindMatlab/versions_checks/CMakeLists.txt
@@ -0,0 +1,52 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(versions_checks)
+
+set(MATLAB_FIND_DEBUG TRUE)
+set(MATLAB_ADDITIONAL_VERSIONS
+ "dummy=14.9")
+
+# the success of the following command is dependent on the current configuration
+# in this case, we are only interested in the version macros
+find_package(Matlab)
+
+
+
+if(NOT COMMAND matlab_get_version_from_release_name)
+ message(FATAL_ERROR "The macro matlab_get_version_from_release_name should be defined")
+endif()
+
+if(NOT COMMAND matlab_get_release_name_from_version)
+ message(FATAL_ERROR "The macro matlab_get_release_name_from_version should be defined")
+endif()
+
+
+# matlab_get_release_name_from_version
+matlab_get_release_name_from_version("7.13" release_name)
+if(NOT release_name STREQUAL "R2011b")
+ message(FATAL_ERROR "version 7.13 does not give release R2011b : '${release_name}' != R2011b")
+endif()
+
+matlab_get_release_name_from_version("14.9" release_name)
+if(NOT release_name STREQUAL "dummy")
+ message(FATAL_ERROR "version 14.9 does not give release dummy : '${release_name}' != dummy")
+endif()
+
+matlab_get_release_name_from_version("14.10" release_name)
+if(NOT release_name STREQUAL "")
+ message(FATAL_ERROR "version 14.10 does not give empty release: '${release_name}' != ''")
+endif()
+
+
+# matlab_get_version_from_release_name
+matlab_get_version_from_release_name("R2011a" version)
+if(NOT version STREQUAL "7.12")
+ message(FATAL_ERROR "Release R2011a does not give version 7.12 : '${version}' != 7.12")
+endif()
+
+matlab_get_version_from_release_name("dummy" version)
+#message(FATAL_ERROR "versionversion = ${version}")
+if(NOT version STREQUAL "14.9")
+ message(FATAL_ERROR "Release dummy does not give version 14.9 : '${version}' != 14.9")
+endif()
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 1bcc3f3..7cbc9fe 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -211,3 +211,8 @@ if(RPMBUILD_EXECUTABLE)
endif()
add_RunCMake_test(COMPILE_LANGUAGE-genex)
+
+# Matlab module related tests
+if(CMake_TEST_FindMatlab)
+ add_RunCMake_test(FindMatlab)
+endif()
diff --git a/Tests/RunCMake/FindMatlab/CMakeLists.txt b/Tests/RunCMake/FindMatlab/CMakeLists.txt
new file mode 100644
index 0000000..1b9a957
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/CMakeLists.txt
@@ -0,0 +1,3 @@
+
+cmake_minimum_required(VERSION 2.8.12)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
new file mode 100644
index 0000000..95a787f
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*FindMatlab.cmake:[0-9]+ \(message\):
+ \[MATLAB\] This functionality needs the MAIN_PROGRAM component \(not default\)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1.cmake b/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
new file mode 100644
index 0000000..1cbc1c2
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
@@ -0,0 +1,22 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(test_should_fail)
+
+find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY)
+
+matlab_add_mex(
+ # target name
+ NAME cmake_matlab_test_wrapper1
+ # output name
+ OUTPUT_NAME cmake_matlab_mex1
+ SRC ${CMAKE_CURRENT_SOURCE_DIR}/matlab_wrapper1.cpp
+ )
+
+# this command should raise a FATAL_ERROR, component MAIN_PROGRAM is missing
+matlab_add_unit_test(
+ NAME ${PROJECT_NAME}_matlabtest-1
+ TIMEOUT 1
+ UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake_matlab_unit_tests2.m
+ ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+ )
diff --git a/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
new file mode 100644
index 0000000..33dbb77
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+
+include(RunCMake)
+run_cmake(MatlabTest1)
diff --git a/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
new file mode 100644
index 0000000..7a8a342
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
@@ -0,0 +1,6 @@
+
+ret = cmake_matlab_mex1(rand(3,3));
+
+if(size(ret) ~= size(rand(3,3)))
+ error('Dimension mismatch!');
+end
diff --git a/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp b/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
new file mode 100644
index 0000000..4149bb9
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
@@ -0,0 +1,26 @@
+
+// simple workaround to some compiler specific problems
+// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
+#include <algorithm>
+
+#include "mex.h"
+
+// this test should return a matrix of 10 x 10 and should check some of the arguments
+
+void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
+{
+ if(nrhs != 1)
+ {
+ mexErrMsgTxt("Incorrect arguments");
+ }
+
+ size_t dim1 = mxGetM(prhs[0]);
+ size_t dim2 = mxGetN(prhs[0]);
+
+ if(dim1 == 1 || dim2 == 1)
+ {
+ mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
+ }
+
+ plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
+}
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/FindMatlab-rewrite.rst | 7 +
Modules/FindMatlab.cmake | 1508 ++++++++++++++++++--
Modules/MatlabTestsRedirect.cmake | 92 ++
Tests/CMakeLists.txt | 6 +
Tests/FindMatlab/basic_checks/CMakeLists.txt | 57 +
Tests/FindMatlab/cmake_matlab_unit_tests1.m | 33 +
Tests/FindMatlab/cmake_matlab_unit_tests2.m | 6 +
Tests/FindMatlab/cmake_matlab_unit_tests3.m | 5 +
Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m | 16 +
Tests/FindMatlab/help_text1.m.txt | 2 +
Tests/FindMatlab/matlab_wrapper1.cpp | 26 +
Tests/FindMatlab/versions_checks/CMakeLists.txt | 52 +
Tests/RunCMake/CMakeLists.txt | 5 +
.../{CMP0038 => FindMatlab}/CMakeLists.txt | 2 +-
.../MatlabTest1-result.txt} | 0
Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt | 2 +
Tests/RunCMake/FindMatlab/MatlabTest1.cmake | 22 +
Tests/RunCMake/FindMatlab/RunCMakeTest.cmake | 3 +
.../RunCMake/FindMatlab/cmake_matlab_unit_tests2.m | 6 +
Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp | 26 +
20 files changed, 1788 insertions(+), 88 deletions(-)
create mode 100644 Help/release/dev/FindMatlab-rewrite.rst
create mode 100644 Modules/MatlabTestsRedirect.cmake
create mode 100644 Tests/FindMatlab/basic_checks/CMakeLists.txt
create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests1.m
create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests2.m
create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests3.m
create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
create mode 100644 Tests/FindMatlab/help_text1.m.txt
create mode 100644 Tests/FindMatlab/matlab_wrapper1.cpp
create mode 100644 Tests/FindMatlab/versions_checks/CMakeLists.txt
copy Tests/RunCMake/{CMP0038 => FindMatlab}/CMakeLists.txt (70%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FindMatlab/MatlabTest1-result.txt} (100%)
create mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
create mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1.cmake
create mode 100644 Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
create mode 100644 Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list