[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-76-g19043bb

Brad King brad.king at kitware.com
Wed Oct 5 09:44:55 EDT 2016


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  19043bbf24eec581b506990ed1aea680b598e262 (commit)
       via  e8893030e696113d778f484750b1afccbfd74d42 (commit)
      from  44a0a9aac4193a647842da6c4298677f9753e7c3 (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=19043bbf24eec581b506990ed1aea680b598e262
commit 19043bbf24eec581b506990ed1aea680b598e262
Merge: 44a0a9a e889303
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 5 09:44:54 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 5 09:44:54 2016 -0400

    Merge topic 'FindMatlab-fix-simulink-cache' into next
    
    e8893030 FindMatlab: remove SIMULINK path from cache when FindMatlab is reconfigured


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8893030e696113d778f484750b1afccbfd74d42
commit e8893030e696113d778f484750b1afccbfd74d42
Author:     Raffi Enficiaud <raffi.enficiaud at mines-paris.org>
AuthorDate: Wed Oct 5 09:26:19 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 5 09:39:20 2016 -0400

    FindMatlab: remove SIMULINK path from cache when FindMatlab is reconfigured

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 6beacce..cc5d3fa 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -1260,6 +1260,7 @@ if(DEFINED Matlab_ROOT_DIR_LAST_CACHED)
         Matlab_ENG_LIBRARY
         Matlab_MAT_LIBRARY
         Matlab_MEX_EXTENSION
+        Matlab_SIMULINK_INCLUDE_DIR
 
         # internal
         Matlab_MEXEXTENSIONS_PROG

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

Summary of changes:
 Modules/FindMatlab.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list