[Cmake-commits] CMake branch, next, updated. v3.6.1-1253-ga63f6c7

[Brad King]

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  a63f6c7ac7e406abe9c12a524bf3f11b1666f74f (commit)
       via  8ba204a69602ca8744aeec4ca3d808c964715ed5 (commit)
      from  b3969f32b26ac79586431b90bb0f3cfc5e426b7f (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a63f6c7ac7e406abe9c12a524bf3f11b1666f74f
commit a63f6c7ac7e406abe9c12a524bf3f11b1666f74f
Merge: b3969f3 8ba204a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 15 09:29:39 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 15 09:29:39 2016 -0400

    Merge topic 'FindMatlab-mingw' into next
    
    8ba204a6 FindMatlab: Use pre-built libraries for MinGW if needed


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ba204a69602ca8744aeec4ca3d808c964715ed5
commit 8ba204a69602ca8744aeec4ca3d808c964715ed5
Author:     Sebastian Niemann <niemann at sra.uni-hannover.de>
AuthorDate: Fri Aug 12 23:39:27 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 15 09:28:54 2016 -0400

    FindMatlab: Use pre-built libraries for MinGW if needed

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})

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindMatlab.cmake |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake