[Cmake-commits] CMake branch, next, updated. v3.2.2-3292-g952349d
Brad King
brad.king at kitware.com
Mon Jun 1 11:34:11 EDT 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 952349dd2c8da06810871801e7f03d0e85eb548e (commit)
via 7dd4a12c301b95512aec62e5e533a9c63aedfdc7 (commit)
from d8ada560d08b0e4591701e31e295c38f639042a6 (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=952349dd2c8da06810871801e7f03d0e85eb548e
commit 952349dd2c8da06810871801e7f03d0e85eb548e
Merge: d8ada56 7dd4a12
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 1 11:34:10 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 1 11:34:10 2015 -0400
Merge topic 'mingw32-make-backslash-workaround' into next
7dd4a12c Revert "Makefile: Fix compilation after parent commit was backported"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7dd4a12c301b95512aec62e5e533a9c63aedfdc7
commit 7dd4a12c301b95512aec62e5e533a9c63aedfdc7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 1 11:33:24 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 1 11:33:24 2015 -0400
Revert "Makefile: Fix compilation after parent commit was backported"
This reverts commit bfa57c5f80278abc044b7342e81e5aaad82bffab.
This change should not be part of 'master', only in 'release'
for CMake 3.2.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index e983546..b7e4e37 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -23,6 +23,7 @@
#include "cmComputeLinkInformation.h"
#include "cmCustomCommandGenerator.h"
#include "cmGeneratorExpression.h"
+#include "cmAlgorithms.h"
#include "cmMakefileExecutableTargetGenerator.h"
#include "cmMakefileLibraryTargetGenerator.h"
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefileTargetGenerator.cxx | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list