[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-353-g2134fab
Brad King
brad.king at kitware.com
Mon Feb 16 09:21:08 EST 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 2134fab0806beb1f0872e37ff7388e062370c476 (commit)
via c23c9083f7c349188df0067fbc685d76983d2b34 (commit)
from f0bc1843730bff040cd5bbdd09e1ccffd47ecb80 (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=2134fab0806beb1f0872e37ff7388e062370c476
commit 2134fab0806beb1f0872e37ff7388e062370c476
Merge: f0bc184 c23c908
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 09:21:07 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 16 09:21:07 2015 -0500
Merge topic 'FindMatlab-rewrite' into next
c23c9083 FindMatlab: Hide 'reg' tool stderr output
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c23c9083f7c349188df0067fbc685d76983d2b34
commit c23c9083f7c349188df0067fbc685d76983d2b34
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 09:18:29 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 16 09:18:29 2015 -0500
FindMatlab: Hide 'reg' tool stderr output
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 3af4252..c30ca37 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -370,7 +370,9 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
execute_process(
COMMAND ${MATLAB_REG_EXE_LOCATION} query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
RESULT_VARIABLE resultMatlab
- OUTPUT_VARIABLE varMatlab)
+ OUTPUT_VARIABLE varMatlab
+ ERROR_VARIABLE errMatlab
+ )
#message("Matlabs = ${varMatlab} | ${resultMatlab}")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindMatlab.cmake | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list