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 513509a2e233824225ce57a6487c26c2e28847fb (commit)
via c7addcd588a34eca30e97e7465833a5cf6642376 (commit)
from d5a8aafd0b82170d54353dca0c17a5d3027b88e7 (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=513509a2e233824225ce57a6487c26c2e28847fb
commit 513509a2e233824225ce57a6487c26c2e28847fb
Merge: d5a8aaf c7addcd
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Sep 22 11:56:44 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 22 11:56:44 2016 -0400
Merge topic 'ninja-fortran' into next
c7addcd5 Ninja: fix bootstrap build
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7addcd588a34eca30e97e7465833a5cf6642376
commit c7addcd588a34eca30e97e7465833a5cf6642376
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Sep 22 11:56:38 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Sep 22 11:56:38 2016 -0400
Ninja: fix bootstrap build
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 782e1dd..2b4a830 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -787,6 +787,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>&
args)
return cmcmd::ExecuteLinkScript(args);
}
+#ifdef CMAKE_BUILD_WITH_CMAKE
// Internal CMake ninja dependency scanning support.
else if (args[1] == "cmake_ninja_depends") {
return cmcmd_cmake_ninja_depends(args.begin() + 2, args.end());
@@ -796,6 +797,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>&
args)
else if (args[1] == "cmake_ninja_dyndep") {
return cmcmd_cmake_ninja_dyndep(args.begin() + 2, args.end());
}
+#endif
// Internal CMake unimplemented feature notification.
else if (args[1] == "cmake_unimplemented_variable") {
-----------------------------------------------------------------------
Summary of changes:
Source/cmcmd.cxx | 2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
