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 82e110fc1b16ec6dd3c7e31dc95638fd36e66f14 (commit)
via 9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1 (commit)
via e3c9be07b25efd06bf38bcd1a740f8bfe7cfb24c (commit)
from 2d0d2138bd1ed05a6b3522f7cb0739b2c71b190e (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=82e110fc1b16ec6dd3c7e31dc95638fd36e66f14
commit 82e110fc1b16ec6dd3c7e31dc95638fd36e66f14
Merge: 2d0d213 9cdc5e6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jul 19 08:01:09 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jul 19 08:01:09 2013 -0400
Merge topic 'mingw-in-codeblocks' into next
9cdc5e6 MinGW: Find mingw32-make included with Code::Blocks IDE (#14302)
e3c9be0 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1
commit 9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1
Author: Jason Spiro <jasonspi...@gmail.com>
AuthorDate: Fri Jul 19 07:04:00 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Jul 19 07:56:37 2013 -0400
MinGW: Find mingw32-make included with Code::Blocks IDE (#14302)
If one installs MinGW using the Code::Blocks IDE installer it goes to a
path like "c:\Program Files\CodeBlocks\MinGW", not "c:\MinGW". Use the
CodeBlocks registry entry to get the location.
Signed-off-by: Jason Spiro <jasonspi...@gmail.com>
diff --git a/Modules/CMakeMinGWFindMake.cmake b/Modules/CMakeMinGWFindMake.cmake
index efba20a..d7298dc 100644
--- a/Modules/CMakeMinGWFindMake.cmake
+++ b/Modules/CMakeMinGWFindMake.cmake
@@ -14,7 +14,9 @@
find_program(CMAKE_MAKE_PROGRAM mingw32-make.exe PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW;InstallLocation]/bin"
- c:/MinGW/bin /MinGW/bin)
+ c:/MinGW/bin /MinGW/bin
+ "[HKEY_CURRENT_USER\\Software\\CodeBlocks;Path]/MinGW/bin"
+ )
find_program(CMAKE_SH sh.exe )
if(CMAKE_SH)
message(FATAL_ERROR "sh.exe was found in your PATH, here:\n${CMAKE_SH}\nFor
MinGW make to work correctly sh.exe must NOT be in your path.\nRun cmake from a
shell that does not have sh.exe in your PATH.\nIf you want to use a UNIX shell,
then use MSYS Makefiles.\n")
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeMinGWFindMake.cmake | 4 +++-
Source/CMakeVersion.cmake | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
