diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-16 17:26:19 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-16 17:26:19 (GMT) |
| commit | 074d098ffb001c6e6c03483746c7bb6e02ab4484 (patch) | |
| tree | 6da165956ad7894927b4ff39d83ae17bec0a571c | |
| parent | 447b142b6a5ae8ee1669cb1a424619af808f1c17 (diff) | |
| parent | 8ba204a69602ca8744aeec4ca3d808c964715ed5 (diff) | |
| download | CMake-074d098ffb001c6e6c03483746c7bb6e02ab4484.zip CMake-074d098ffb001c6e6c03483746c7bb6e02ab4484.tar.gz CMake-074d098ffb001c6e6c03483746c7bb6e02ab4484.tar.bz2 | |
Merge topic 'FindMatlab-mingw'
8ba204a6 FindMatlab: Use pre-built libraries for MinGW if needed
| -rw-r--r-- | Modules/FindMatlab.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 956dad2..46285aa 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -1287,7 +1287,11 @@ 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) + if(MINGW) + set(_matlab_lib_dir_for_search ${Matlab_EXTERN_LIBRARY_DIR}/mingw64) + else() + set(_matlab_lib_dir_for_search ${Matlab_EXTERN_LIBRARY_DIR}/microsoft) + endif() set(_matlab_lib_prefix_for_search "lib") else() set(_matlab_lib_dir_for_search ${Matlab_BINARIES_DIR}) |