diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-01 13:37:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-01 13:37:32 (GMT) |
| commit | 02c4aa1f97f5436e3f2f2ba07c492a24bad04c4f (patch) | |
| tree | e4243e5946baa2fcdad98d55a57aa6ffd26976f0 /Modules | |
| parent | 40bad5149054c7e9efdc9fdd645e5ce024225b4f (diff) | |
| parent | 8444809c47b0c2d6b9b2b57bd62d9a51fc5fa498 (diff) | |
| download | CMake-02c4aa1f97f5436e3f2f2ba07c492a24bad04c4f.zip CMake-02c4aa1f97f5436e3f2f2ba07c492a24bad04c4f.tar.gz CMake-02c4aa1f97f5436e3f2f2ba07c492a24bad04c4f.tar.bz2 | |
Merge topic 'FindMatlab-fix-visibility-and-reconfiguration'
8444809c FindMatlab: fix reconfiguration of Matlab_ROOT_DIR
5752e558 FindMatlab: fix header visibility of the generated mex files
221a0263 FindMatlab: Drop incorrect usage option from test helper script
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindMatlab.cmake | 7 | ||||
| -rw-r--r-- | Modules/MatlabTestsRedirect.cmake | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index b4beec3..028bf5a 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -134,7 +134,8 @@ # 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. +# returns the version of Matlab, given the full directory of the Matlab +# program. # # # Known issues @@ -918,7 +919,7 @@ function(matlab_add_mex ) PROPERTIES CXX_VISIBILITY_PRESET "hidden" C_VISIBILITY_PRESET "hidden" - VISIBILITY_INLINES_HIDDEN "hidden" + VISIBILITY_INLINES_HIDDEN ON ) # get_target_property( @@ -1064,7 +1065,7 @@ if(Matlab_ROOT_DIR) endif() else() # NOTFOUND indicates the code below to search for the version automatically - if(NOT DEFINED Matlab_VERSION_STRING_INTERNAL) + if("${Matlab_VERSION_STRING_INTERNAL}" STREQUAL "") 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 diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake index ebccbf6..77b7afe 100644 --- a/Modules/MatlabTestsRedirect.cmake +++ b/Modules/MatlabTestsRedirect.cmake @@ -17,7 +17,6 @@ # Usage: cmake # -Dtest_timeout=180 -# -Dworking_directory="." # -Doutput_directory= # -Dadditional_paths="" # -Dno_unittest_framework="" |