[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-248-ge104391
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, master has been updated via e10439121e9602f77f80531dd60acc781fba5e79 (commit) from 0de6a404aafb497074980eba5144d243b6868d68 (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=e10439121e9602f77f80531dd60acc781fba5e79 commit e10439121e9602f77f80531dd60acc781fba5e79 Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Thu Oct 20 00:01:03 2016 -0400 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Thu Oct 20 00:01:03 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f68167c..223e473 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 7) -set(CMake_VERSION_PATCH 20161019) +set(CMake_VERSION_PATCH 20161020) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-615-g65c4cae
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 65c4caedf049d34effbadfae449c00974ebf11c2 (commit) via 042ce68948fde096fc99d0658994646f9651be6f (commit) via 93b60614f97cb7cb0a181a10c2f56ae624f31448 (commit) from 01c002450510e33e7f66da1af4b7d14de97156ca (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=65c4caedf049d34effbadfae449c00974ebf11c2 commit 65c4caedf049d34effbadfae449c00974ebf11c2 Merge: 01c0024 042ce68 Author: Brad KingAuthorDate: Wed Oct 19 16:26:47 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 16:26:47 2016 -0400 Merge topic 'split-cmState' into next 042ce689 cmListFileCache: Remove cmState header include 93b60614 cmTargetPropertyComputer: Add missing include https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=042ce68948fde096fc99d0658994646f9651be6f commit 042ce68948fde096fc99d0658994646f9651be6f Author: Stephen Kelly AuthorDate: Tue Oct 18 21:28:49 2016 +0200 Commit: Stephen Kelly CommitDate: Wed Oct 19 15:41:00 2016 +0200 cmListFileCache: Remove cmState header include Include it in dependents which have previously relied on it transitively. diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index e3adf6b..c305cbf 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -9,6 +9,7 @@ #include "cmDocumentationEntry.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" +#include "cmState.h" #include "cmStateTypes.h" #include "cmSystemTools.h" #include "cmTypeMacro.h" diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index fa816a6..7ee0f75 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -21,6 +21,7 @@ #include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" +#include "cmState.h" #include "cmStateTypes.h" #include "cmSystemTools.h" #include "cmake.h" diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index a114755..d21471d 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -7,6 +7,7 @@ #include "cmCTestScriptHandler.h" #include "cmCurl.h" #include "cmGeneratedFileStream.h" +#include "cmState.h" #include "cmStateTypes.h" #include "cmSystemTools.h" #include "cmXMLParser.h" diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 09efafb..4e6f1e9 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -9,6 +9,7 @@ #include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" +#include "cmState.h" #include "cmStateTypes.h" #include "cmSystemTools.h" #include "cmXMLWriter.h" diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx index 5d29942..5539fbe 100644 --- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx +++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx @@ -9,6 +9,7 @@ #include "cmCursesPathWidget.h" #include "cmCursesStringWidget.h" #include "cmCursesWidget.h" +#include "cmState.h" #include "cmStateTypes.h" #include "cmSystemTools.h" #include "cmake.h" diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx index e8e70df..ebd35f3 100644 --- a/Source/CursesDialog/cmCursesMainForm.cxx +++ b/Source/CursesDialog/cmCursesMainForm.cxx @@ -11,6 +11,7 @@ #include "cmCursesStandardIncludes.h" #include "cmCursesStringWidget.h" #include "cmCursesWidget.h" +#include "cmState.h" #include "cmStateTypes.h" #include "cmSystemTools.h" #include "cmVersion.h" diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx index 3cde147..0777ef0 100644 --- a/Source/cmAddLibraryCommand.cxx +++ b/Source/cmAddLibraryCommand.cxx @@ -2,6 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmAddLibraryCommand.h" +#include "cmState.h" #include "cmStateTypes.h" #include "cmake.h" diff --git a/Source/cmCMakePolicyCommand.cxx b/Source/cmCMakePolicyCommand.cxx index 36ffd7c..67581b6 100644 --- a/Source/cmCMakePolicyCommand.cxx +++ b/Source/cmCMakePolicyCommand.cxx @@ -2,6 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCMakePolicyCommand.h" +#include "cmState.h" #include "cmVersion.h" // cmCMakePolicyCommand diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-612-g01c0024
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 01c002450510e33e7f66da1af4b7d14de97156ca (commit) via 437d9ffa10541a43c9af08e0d8da52728506d536 (commit) from ec25bfbe1a2623245fb3b7bc047b5243d3916dfd (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=01c002450510e33e7f66da1af4b7d14de97156ca commit 01c002450510e33e7f66da1af4b7d14de97156ca Merge: ec25bfb 437d9ff Author: Brad KingAuthorDate: Wed Oct 19 16:26:31 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 16:26:31 2016 -0400 Merge topic 'split-cmState' into next 437d9ffa Fix style of topic 'split-cmState' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=437d9ffa10541a43c9af08e0d8da52728506d536 commit 437d9ffa10541a43c9af08e0d8da52728506d536 Author: Brad King AuthorDate: Wed Oct 19 16:26:05 2016 -0400 Commit: Brad King CommitDate: Wed Oct 19 16:26:05 2016 -0400 Fix style of topic 'split-cmState' diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx index 6d85861..78bf5bd 100644 --- a/Source/cmGlobalJOMMakefileGenerator.cxx +++ b/Source/cmGlobalJOMMakefileGenerator.cxx @@ -3,8 +3,8 @@ #include "cmGlobalJOMMakefileGenerator.h" #include "cmLocalUnixMakefileGenerator3.h" -#include "cmState.h" #include "cmMakefile.h" +#include "cmState.h" cmGlobalJOMMakefileGenerator::cmGlobalJOMMakefileGenerator(cmake* cm) : cmGlobalUnixMakefileGenerator3(cm) diff --git a/Source/cmGlobalMinGWMakefileGenerator.cxx b/Source/cmGlobalMinGWMakefileGenerator.cxx index 4a14df9..255c0f5 100644 --- a/Source/cmGlobalMinGWMakefileGenerator.cxx +++ b/Source/cmGlobalMinGWMakefileGenerator.cxx @@ -3,8 +3,8 @@ #include "cmGlobalMinGWMakefileGenerator.h" #include "cmLocalUnixMakefileGenerator3.h" -#include "cmState.h" #include "cmMakefile.h" +#include "cmState.h" cmGlobalMinGWMakefileGenerator::cmGlobalMinGWMakefileGenerator(cmake* cm) : cmGlobalUnixMakefileGenerator3(cm) diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx index 92af8a9..06aba73 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.cxx +++ b/Source/cmGlobalNMakeMakefileGenerator.cxx @@ -2,9 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalNMakeMakefileGenerator.h" -#include "cmState.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" +#include "cmState.h" cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator(cmake* cm) : cmGlobalUnixMakefileGenerator3(cm) diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index d6209db..0782182 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -9,8 +9,8 @@ #include "cmGeneratorTarget.h" #include "cmLocalVisualStudioGenerator.h" #include "cmMakefile.h" -#include "cmState.h" #include "cmSourceFile.h" +#include "cmState.h" #include "cmTarget.h" #include diff --git a/Source/cmTargetPropertyComputer.h b/Source/cmTargetPropertyComputer.h index 817e8c2..352d858 100644 --- a/Source/cmTargetPropertyComputer.h +++ b/Source/cmTargetPropertyComputer.h @@ -5,9 +5,9 @@ #include // IWYU pragma: keep +#include "cmAlgorithms.h" #include "cmListFileCache.h" #include "cmSystemTools.h" -#include "cmAlgorithms.h" #include #include --- Summary of changes: Source/cmGlobalJOMMakefileGenerator.cxx |2 +- Source/cmGlobalMinGWMakefileGenerator.cxx |2 +- Source/cmGlobalNMakeMakefileGenerator.cxx |2 +- Source/cmGlobalVisualStudioGenerator.cxx |2 +- Source/cmTargetPropertyComputer.h |2 +- 5 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.7.0-rc2, created. v3.7.0-rc2
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 annotated tag, v3.7.0-rc2 has been created at 43fe2e0863278f06ccd9cd7e845ff9b0fd7031b9 (tag) tagging 876da11858ab6649bb088c4bb7758fc84910ba20 (commit) replaces v3.7.0-rc1 tagged by Brad King on Wed Oct 19 10:53:36 2016 -0400 - Log - CMake 3.7.0-rc2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdBQJYB4jwFhxicmFkLmtpbmdAa2l0d2FyZS5jb20ACgkQLSzvEDSS FoQo+w//Q4sgQCUH2rYOCMleN0N95xOdDcawh1nhdF5Fl7TvGVK4sNAM6NBjdPKD tA+jYZ15AkXMbk0+mDo7Y2bZziujbZvpU6iiKxdaZ+h+lHiUEAFMUm15j+wgldj9 qFcQFEVRmHR0EPSDLntxa3LfCtYTR6F2QEAeye9inqWwzXplZV7zz+5jHwAHnJpM YQV777aQ4uYyt0OAwtv5jYQjp07jzcbg3uleLds3TNynId7ChiMYZNO3Kao0eDrC qdBqVfCRzDo/UtxHAAdcndRtzvEgLIPHQx84vwR1tiFHg4o1l/caxWZSM0aXxbv5 JmDmx5hIV7XLA0XhwyHHuV5gnIhhN85FuCp0UrmFeJiIFH+H5xggTYm9t59gioB4 KT3dv6skStNGalhEuhT8MleLDNnouEjv2Jf4yOZvNvMDpf5lj6qva1dfmNYDNAEZ 9os5q+QVG+HsAv5dfXj5oqqSpYdYVRKBVs8A9UvpAB9cPxKJdqtpVQSLcTCROyxc bCvMa0rP3idW9ws19UGA6s1oNO7rGcw3jXZyX7ZKOcTLDk7vXqiuEDDXZAj1vOBY sL+vXZbD3cSfJcIXdLWTnp9Cx5vdxgh2H9v64/oJyMfGWxOECLGD4hfMHDIjtQbb uM/UcX6tmC46tMqHd6FtsA0vvvO4P63M5hbD95BJnfSLbjctKKQ= =/HQ7 -END PGP SIGNATURE- Ben Boeckel (3): Ninja: Fix RC language depfile generation with cmcldeps ExternalProject: error out only if the property is unset ExternalProject: make SOURCE_SUBDIR directly appendable Brad King (43): QtIFW: Reference cmake.org via https in cmake.org.html Merge branch 'cmake-server-improve-shutdown' into release Merge branch 'qtifw-https-cmake.org' into release Merge branch 'fix-VS-resources-pri-path' into release Merge branch 'FindMatlab-documentation' into release Merge branch 'FindMatlab-fix-simulink-cache' into release Merge branch 'cpack-rpm-debuginfo-fixes' into release Android: Suppress -Wattributes warnings in test case builds Android: Update libc++ include directories for NDK r13 Merge branch 'android-ndk-r13' into release Merge branch 'codelite-global-setting' into release Merge branch 'check-libuv-minimum-version' into release Android: Fix support for cxxabi.h with libc++ Merge branch 'android-cxxabi' into release Merge branch 'FindProtobuf-fix-subdirs' into release Android: Record use of C++ by static libs in exported Android.mk files Merge branch 'android-export-has-cpp' into release Merge branch 'upstream-KWSys' into update-kwsys Merge branch 'update-kwsys' into release VS: Split flag table between v140 and v141 toolsets Merge branch 'vs15-separate-flag-table' into release Merge branch 'ExternalProject-fix-CMAKE_CACHE_ARGS-list' into release cmake-gui: Fix "extra" generator entries in drop-down list Merge branch 'cmake-gui-fix-extra-generator-names' into release Merge branch 'ice-3.6.3' into release Merge branch 'ninja-rc-regression' into release Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into release Ninja: Fix POST_BUILD commands on macOS Frameworks Merge branch 'ninja-framework-POST_BUILD' into release Help: Clarify `ctest_*` APPEND option behavior Merge branch 'doc-clarify-ctest-APPEND' into release Help: Fix math(EXPR) documentation formatting Merge branch 'doc-math-EXPR' into release Merge branch 'osx-no-deployment-target-on-cross-compile' into release FindwxWidgets: Fix finding unversioned VS-built directory prefixes Merge branch 'FindwxWidgets-unversioned-library-path' into release Merge branch 'external-project-source-subdir-usage' into release Merge branch 'cmake-server-pipe-mode-fix' into release VS: Fix NVIDIA Nsight Tegra Visual Studio Edition support Tests: Fix VSNsightTegra test on Android NDK r12b Tests: Add VSNsightTegra test for VS 2015 Merge branch 'fix-Android-NsightTegra' into release CMake 3.7.0-rc2 Chuck Atkins (2): Use find_package for JsonCpp and LibUV instead of include Set minimum version for LibUV to 1.0.0 Domen Vrankar (2): CPack/RPM debuginfo package objdump error suppression CPack/RPM debuginfo package without binaries Gregor Jasny (1): OS X: Do not try to set deployment target when cross-compiling Jamie Snape (1): Honor LINK_WHAT_YOU_USE when set to OFF KWSys Upstream (1): KWSys 2016-10-07 (dfe9b386) Martin Joly (1): FindProtobuf: Fix protobuf_generate_*() to handle subdirs Max Smolens (1): ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGS Raffi Enficiaud (3): FindMatlab: remove SIMULINK path from cache when FindMatlab is reconfigured FindMatlab: small documentation fixes Help: Extend 3.7 release notes for FindMatlab Roger Leigh (1): FindIce: Add support
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-674-gec25bfb
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 ec25bfbe1a2623245fb3b7bc047b5243d3916dfd (commit) via d2080ff950d88d91f80affce596171862c0fcd59 (commit) from 307cb3c1f24857f4ff93747c14fb268d6b20fdb4 (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=ec25bfbe1a2623245fb3b7bc047b5243d3916dfd commit ec25bfbe1a2623245fb3b7bc047b5243d3916dfd Merge: 307cb3c d2080ff Author: Daniel PfeiferAuthorDate: Wed Oct 19 15:06:55 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 15:06:55 2016 -0400 Merge topic 'clang-tidy' into next d2080ff9 fixup! fix more issues reported by clang-tidy https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2080ff950d88d91f80affce596171862c0fcd59 commit d2080ff950d88d91f80affce596171862c0fcd59 Author: Daniel Pfeifer AuthorDate: Wed Oct 19 21:06:13 2016 +0200 Commit: Daniel Pfeifer CommitDate: Wed Oct 19 21:06:13 2016 +0200 fixup! fix more issues reported by clang-tidy diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 073d0d6..de48193 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -934,13 +934,15 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value, e << "NAME property is read-only\n"; this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); return; - } else if (prop == "EXPORT_NAME" && this->IsImported()) { + } + if (prop == "EXPORT_NAME" && this->IsImported()) { std::ostringstream e; e << "EXPORT_NAME property can't be set on imported targets (\"" << this->Name << "\")\n"; this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); return; - } else if (prop == "SOURCES" && this->IsImported()) { + } + if (prop == "SOURCES" && this->IsImported()) { std::ostringstream e; e << "SOURCES property can't be set on imported targets (\"" << this->Name << "\")\n"; diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 290261a..b878534 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -803,9 +803,13 @@ int cmcmd::ExecuteCMakeCommand(std::vector& args) } std::cerr << std::endl; return 1; -} else if (args[1] == "vs_link_exe") { +} + +if (args[1] == "vs_link_exe") { return cmcmd::VisualStudioLink(args, 1); -} else if (args[1] == "vs_link_dll") { +} + +if (args[1] == "vs_link_dll") { return cmcmd::VisualStudioLink(args, 2); } @@ -928,7 +932,9 @@ int cmcmd::ExecuteCMakeCommand(std::vector& args) #endif } return 0; -} else if (args[1] == "server") { +} + +if (args[1] == "server") { const std::string pipePrefix = "--pipe="; bool supportExperimental = false; bool isDebug = false; --- Summary of changes: Source/cmTarget.cxx |6 -- Source/cmcmd.cxx| 12 +--- 2 files changed, 13 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-672-g307cb3c
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 307cb3c1f24857f4ff93747c14fb268d6b20fdb4 (commit) via f27492a4db2c56f334b2ca5c746b01b8e9a04995 (commit) via 4f78b9ff2df89d5b4104f92251feb0a7f0976d7f (commit) from c6eb6f124e422969b4d4b7a64dd86122bbc058be (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=307cb3c1f24857f4ff93747c14fb268d6b20fdb4 commit 307cb3c1f24857f4ff93747c14fb268d6b20fdb4 Merge: c6eb6f1 f27492a Author: Brad KingAuthorDate: Wed Oct 19 11:15:16 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 11:15:16 2016 -0400 Merge topic 'vs-csharp-prep' into next f27492a4 VS: Add internal API for detecting "managed" projects 4f78b9ff VS: Add CSharp project uuid and file extension https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f27492a4db2c56f334b2ca5c746b01b8e9a04995 commit f27492a4db2c56f334b2ca5c746b01b8e9a04995 Author: Michael Stürmer AuthorDate: Fri Sep 23 12:15:40 2016 +0200 Commit: Brad King CommitDate: Wed Oct 19 11:14:19 2016 -0400 VS: Add internal API for detecting "managed" projects This is in preparation for adding CSharp language support to the VS generator. diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index 9badda6..4be183d 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -137,6 +137,11 @@ bool cmVisualStudioGeneratorOptions::IsWinRt() const return this->FlagMap.find("CompileAsWinRT") != this->FlagMap.end(); } +bool cmVisualStudioGeneratorOptions::IsManaged() const +{ + return this->FlagMap.find("CompileAsManaged") != this->FlagMap.end(); +} + bool cmVisualStudioGeneratorOptions::UsingUnicode() const { // Look for the a _UNICODE definition. diff --git a/Source/cmVisualStudioGeneratorOptions.h b/Source/cmVisualStudioGeneratorOptions.h index 4eeae3d..0a0b96d 100644 --- a/Source/cmVisualStudioGeneratorOptions.h +++ b/Source/cmVisualStudioGeneratorOptions.h @@ -49,6 +49,7 @@ public: bool IsDebug() const; bool IsWinRt() const; + bool IsManaged() const; // Write options to output. void OutputPreprocessorDefinitions(std::ostream& fout, const char* prefix, const char* suffix, https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f78b9ff2df89d5b4104f92251feb0a7f0976d7f commit 4f78b9ff2df89d5b4104f92251feb0a7f0976d7f Author: Michael Stürmer AuthorDate: Fri Sep 23 12:15:40 2016 +0200 Commit: Brad King CommitDate: Wed Oct 19 11:14:16 2016 -0400 VS: Add CSharp project uuid and file extension This is in preparation for adding CSharp language support to the VS generator. diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index ffd87e2..1fa2741 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -159,6 +159,10 @@ void cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout, ext = ".vfproj"; project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \""; } + if (this->TargetIsCSharpOnly(t)) { +ext = ".csproj"; +project = "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \""; + } const char* targetExt = t->GetProperty("GENERATOR_FILE_NAME_EXT"); if (targetExt) { ext = targetExt; diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 6296dd2..b277391 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -734,6 +734,27 @@ bool cmGlobalVisualStudioGenerator::TargetIsFortranOnly( return false; } +bool cmGlobalVisualStudioGenerator::TargetIsCSharpOnly( + cmGeneratorTarget const* gt) +{ + // check to see if this is a C# build + std::set languages; + { +// Issue diagnostic if the source files depend on the config. +std::vector sources; +if (!gt->GetConfigCommonSourceFiles(sources)) { + return false; +} + } + gt->GetLanguages(languages, ""); + if (languages.size() == 1) { +if (*languages.begin() == "CSharp") { + return true; +} + } + return false; +} + bool cmGlobalVisualStudioGenerator::TargetCompare::operator()( cmGeneratorTarget const* l, cmGeneratorTarget const* r) const { diff --git a/Source/cmGlobalVisualStudioGenerator.h
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-669-gc6eb6f1
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 c6eb6f124e422969b4d4b7a64dd86122bbc058be (commit) via e80c272bcd8e6bf2f1549218f7b3cc2a03087482 (commit) from 2811bf8d21c1441b3846621b31b62a4bc634fcd4 (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=c6eb6f124e422969b4d4b7a64dd86122bbc058be commit c6eb6f124e422969b4d4b7a64dd86122bbc058be Merge: 2811bf8 e80c272 Author: Brad KingAuthorDate: Wed Oct 19 11:09:11 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 11:09:11 2016 -0400 Merge topic 'vs-csharp-prep' into next e80c272b Revert topic 'vs-csharp-prep' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e80c272bcd8e6bf2f1549218f7b3cc2a03087482 commit e80c272bcd8e6bf2f1549218f7b3cc2a03087482 Author: Brad King AuthorDate: Wed Oct 19 11:08:54 2016 -0400 Commit: Brad King CommitDate: Wed Oct 19 11:08:54 2016 -0400 Revert topic 'vs-csharp-prep' It logically conflicts with another topic in next. diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index 1fa2741..ffd87e2 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -159,10 +159,6 @@ void cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout, ext = ".vfproj"; project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \""; } - if (this->TargetIsCSharpOnly(t)) { -ext = ".csproj"; -project = "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \""; - } const char* targetExt = t->GetProperty("GENERATOR_FILE_NAME_EXT"); if (targetExt) { ext = targetExt; diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 151d1d3..6296dd2 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -734,30 +734,6 @@ bool cmGlobalVisualStudioGenerator::TargetIsFortranOnly( return false; } -bool cmGlobalVisualStudioGenerator::TargetIsCSharpOnly( - cmGeneratorTarget const* gt) -{ - if (gt->GetType() > cmState::OBJECT_LIBRARY) { -return false; - } - // check to see if this is a C# build - std::set languages; - { -// Issue diagnostic if the source files depend on the config. -std::vector sources; -if (!gt->GetConfigCommonSourceFiles(sources)) { - return false; -} - } - gt->GetLanguages(languages, ""); - if (languages.size() == 1) { -if (*languages.begin() == "CSharp") { - return true; -} - } - return false; -} - bool cmGlobalVisualStudioGenerator::TargetCompare::operator()( cmGeneratorTarget const* l, cmGeneratorTarget const* r) const { diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h index c8fc984..a774d96 100644 --- a/Source/cmGlobalVisualStudioGenerator.h +++ b/Source/cmGlobalVisualStudioGenerator.h @@ -69,9 +69,6 @@ public: // return true if target is fortran only bool TargetIsFortranOnly(const cmGeneratorTarget* gt); - // return true if target is C# only - static bool TargetIsCSharpOnly(cmGeneratorTarget const* gt); - /** Get the top-level registry key for this VS version. */ std::string GetRegistryBase(); diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index 4be183d..9badda6 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -137,11 +137,6 @@ bool cmVisualStudioGeneratorOptions::IsWinRt() const return this->FlagMap.find("CompileAsWinRT") != this->FlagMap.end(); } -bool cmVisualStudioGeneratorOptions::IsManaged() const -{ - return this->FlagMap.find("CompileAsManaged") != this->FlagMap.end(); -} - bool cmVisualStudioGeneratorOptions::UsingUnicode() const { // Look for the a _UNICODE definition. diff --git a/Source/cmVisualStudioGeneratorOptions.h b/Source/cmVisualStudioGeneratorOptions.h index 0a0b96d..4eeae3d 100644 --- a/Source/cmVisualStudioGeneratorOptions.h +++ b/Source/cmVisualStudioGeneratorOptions.h @@ -49,7 +49,6 @@ public: bool IsDebug() const; bool IsWinRt() const; - bool IsManaged() const; // Write options to output. void OutputPreprocessorDefinitions(std::ostream& fout, const char* prefix, const char* suffix, --- Summary of changes: Source/cmGlobalVisualStudio71Generator.cxx |4
[Cmake-commits] CMake branch, master, updated. v3.7.0-rc1-311-g0de6a40
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, master has been updated via 0de6a404aafb497074980eba5144d243b6868d68 (commit) via 876da11858ab6649bb088c4bb7758fc84910ba20 (commit) from aa105725152defd75b11a96e27db8b28b9e884a5 (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 - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.7.0-rc1-64-g876da11
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, release has been updated via 876da11858ab6649bb088c4bb7758fc84910ba20 (commit) from a0c539b5460da283433976053ea181f07fcea32e (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 - --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-667-g2811bf8
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 2811bf8d21c1441b3846621b31b62a4bc634fcd4 (commit) via 0de6a404aafb497074980eba5144d243b6868d68 (commit) from 773fa853f2c6bc5d108b47a536f6cb43658771ac (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=2811bf8d21c1441b3846621b31b62a4bc634fcd4 commit 2811bf8d21c1441b3846621b31b62a4bc634fcd4 Merge: 773fa85 0de6a40 Author: Brad KingAuthorDate: Wed Oct 19 10:57:22 2016 -0400 Commit: Brad King CommitDate: Wed Oct 19 10:57:22 2016 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-665-g773fa85
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 773fa853f2c6bc5d108b47a536f6cb43658771ac (commit) via 63d215dfa8373899d0d35f2c28ea0aa7a672be8c (commit) from 24b4801a660b64f6736a0fcc6f8f4c0f2b5d72ed (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=773fa853f2c6bc5d108b47a536f6cb43658771ac commit 773fa853f2c6bc5d108b47a536f6cb43658771ac Merge: 24b4801 63d215d Author: Brad KingAuthorDate: Wed Oct 19 10:46:37 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 10:46:37 2016 -0400 Merge topic 'external-project-configure-command-extraction' into next 63d215df ExternalProject: support extracting the configure command https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63d215dfa8373899d0d35f2c28ea0aa7a672be8c commit 63d215dfa8373899d0d35f2c28ea0aa7a672be8c Author: Ben Boeckel AuthorDate: Tue Oct 18 10:39:05 2016 -0400 Commit: Ben Boeckel CommitDate: Wed Oct 19 08:58:25 2016 -0400 ExternalProject: support extracting the configure command Previously, the configure command generated by ExternalProject was not accessible prior to actually adding the targets. This makes the CMake configure command accessible with just a call to _ep_parse_arguments. Future work will leverage this to support custom environment settings on a per-project basis. diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 4551cc8..4d702c8 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1180,6 +1180,7 @@ function(_ep_write_initial_cache target_name script_filename script_initial_cach # Write out values into an initial cache, that will be passed to CMake with -C # Replace location tags. _ep_replace_location_tags(${target_name} script_initial_cache) + _ep_replace_location_tags(${target_name} script_filename) # Write out the initial cache file to the location specified. file(GENERATE OUTPUT "${script_filename}" CONTENT "${script_initial_cache}") endfunction() @@ -2181,24 +2182,7 @@ function(_ep_add_patch_command name) endfunction() -# TODO: Make sure external projects use the proper compiler -function(_ep_add_configure_command name) - ExternalProject_Get_Property(${name} source_dir source_subdir binary_dir tmp_dir) - - # Depend on other external projects (file-level). - set(file_deps) - get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS) - foreach(dep IN LISTS deps) -get_property(dep_type TARGET ${dep} PROPERTY TYPE) -if(dep_type STREQUAL "UTILITY") - get_property(is_ep TARGET ${dep} PROPERTY _EP_IS_EXTERNAL_PROJECT) - if(is_ep) -_ep_get_step_stampfile(${dep} "done" done_stamp_file) -list(APPEND file_deps ${done_stamp_file}) - endif() -endif() - endforeach() - +function(_ep_extract_configure_command var name) get_property(cmd_set TARGET ${name} PROPERTY _EP_CONFIGURE_COMMAND SET) if(cmd_set) get_property(cmd TARGET ${name} PROPERTY _EP_CONFIGURE_COMMAND) @@ -2219,7 +2203,7 @@ function(_ep_add_configure_command name) get_property(cmake_cache_default_args TARGET ${name} PROPERTY _EP_CMAKE_CACHE_DEFAULT_ARGS) if(cmake_cache_args OR cmake_cache_default_args) - set(_ep_cache_args_script "${tmp_dir}/${name}-cache-$.cmake") + set(_ep_cache_args_script "/${name}-cache-$.cmake") if(cmake_cache_args) _ep_command_line_to_initial_cache(script_initial_cache_force "${cmake_cache_args}" 1) endif() @@ -2261,9 +2245,32 @@ function(_ep_add_configure_command name) endif() endif() -list(APPEND cmd "${source_dir}${source_subdir}") +list(APPEND cmd "") endif() + set("${var}" "${cmd}" PARENT_SCOPE) +endfunction() + +# TODO: Make sure external projects use the proper compiler +function(_ep_add_configure_command name) + ExternalProject_Get_Property(${name} binary_dir tmp_dir) + + # Depend on other external projects (file-level). + set(file_deps) + get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS) + foreach(dep IN LISTS deps) +get_property(dep_type TARGET ${dep} PROPERTY TYPE) +if(dep_type STREQUAL "UTILITY") + get_property(is_ep TARGET ${dep} PROPERTY _EP_IS_EXTERNAL_PROJECT) + if(is_ep) +_ep_get_step_stampfile(${dep} "done" done_stamp_file) +list(APPEND file_deps ${done_stamp_file}) + endif() +endif() + endforeach() + + _ep_extract_configure_command(cmd ${name}) + # If anything about the configure command
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-663-g24b4801
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 24b4801a660b64f6736a0fcc6f8f4c0f2b5d72ed (commit) via c44804bd2c49cfc5ae2d588c2f9e81a8515e35c9 (commit) via fb461cacba5afe98fd9871d4b8ab0500d825ad5a (commit) from 075a06080ff86467dcc70bb2d4f467b8bc87eddf (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=24b4801a660b64f6736a0fcc6f8f4c0f2b5d72ed commit 24b4801a660b64f6736a0fcc6f8f4c0f2b5d72ed Merge: 075a060 c44804b Author: Brad KingAuthorDate: Wed Oct 19 10:45:21 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 10:45:21 2016 -0400 Merge topic 'clang-tidy' into next c44804bd fix more issues reported by clang-tidy fb461cac silence selected clang-tidy violations https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c44804bd2c49cfc5ae2d588c2f9e81a8515e35c9 commit c44804bd2c49cfc5ae2d588c2f9e81a8515e35c9 Author: Daniel Pfeifer AuthorDate: Tue Oct 18 23:16:02 2016 +0200 Commit: Daniel Pfeifer CommitDate: Tue Oct 18 23:16:02 2016 +0200 fix more issues reported by clang-tidy diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index d9ac909..0098a4b 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -231,7 +231,7 @@ public: protected: void StartElement(const std::string& name, const char** /*atts*/) CM_OVERRIDE { -file = name == "file" ? true : false; +file = name == "file"; if (file) { hasFiles = true; } diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index 360c852..efce263 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -430,17 +430,19 @@ void cmExtraCodeLiteGenerator::CreateProjectSourceEntries( xml.StartElement("General"); std::string outputPath = mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH"); - if (!outputPath.empty()) + if (!outputPath.empty()) { xml.Attribute("OutputFile", outputPath + "/$(ProjectName)"); - else + } else { xml.Attribute("OutputFile", "$(IntermediateDirectory)/$(ProjectName)"); + } xml.Attribute("IntermediateDirectory", "./"); xml.Attribute("Command", "./$(ProjectName)"); xml.Attribute("CommandArguments", ""); - if (!outputPath.empty()) + if (!outputPath.empty()) { xml.Attribute("WorkingDirectory", outputPath); - else + } else { xml.Attribute("WorkingDirectory", "$(IntermediateDirectory)"); + } xml.Attribute("PauseExecWhenProcTerminates", "yes"); xml.EndElement(); // General diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index a71ff71..8dd204b 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -115,41 +115,59 @@ bool cmFileCommand::InitialPass(std::vector const& args, } if (subCommand == "STRINGS") { return this->HandleStringsCommand(args); - } else if (subCommand == "GLOB") { + } + if (subCommand == "GLOB") { return this->HandleGlobCommand(args, false); - } else if (subCommand == "GLOB_RECURSE") { + } + if (subCommand == "GLOB_RECURSE") { return this->HandleGlobCommand(args, true); - } else if (subCommand == "MAKE_DIRECTORY") { + } + if (subCommand == "MAKE_DIRECTORY") { return this->HandleMakeDirectoryCommand(args); - } else if (subCommand == "RENAME") { + } + if (subCommand == "RENAME") { return this->HandleRename(args); - } else if (subCommand == "REMOVE") { + } + if (subCommand == "REMOVE") { return this->HandleRemove(args, false); - } else if (subCommand == "REMOVE_RECURSE") { + } + if (subCommand == "REMOVE_RECURSE") { return this->HandleRemove(args, true); - } else if (subCommand == "COPY") { + } + if (subCommand == "COPY") { return this->HandleCopyCommand(args); - } else if (subCommand == "INSTALL") { + } + if (subCommand == "INSTALL") { return this->HandleInstallCommand(args); - } else if (subCommand == "DIFFERENT") { + } + if (subCommand == "DIFFERENT") { return this->HandleDifferentCommand(args); - } else if (subCommand == "RPATH_CHANGE" || subCommand == "CHRPATH") { + } + if (subCommand == "RPATH_CHANGE" || subCommand == "CHRPATH") { return this->HandleRPathChangeCommand(args); - } else if (subCommand == "RPATH_CHECK") { + } + if (subCommand == "RPATH_CHECK") { return this->HandleRPathCheckCommand(args); - } else if (subCommand == "RPATH_REMOVE") { + } + if (subCommand == "RPATH_REMOVE") { return
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-660-g075a060
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 075a06080ff86467dcc70bb2d4f467b8bc87eddf (commit) via 2e2ba95cb9d7806219c76773e81f91056e83077f (commit) via 5618f7123d9ed3667d5cb53a05779d10ae6438ff (commit) from eb5c141897404324d13c7cf568f9c92e80cb4609 (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=075a06080ff86467dcc70bb2d4f467b8bc87eddf commit 075a06080ff86467dcc70bb2d4f467b8bc87eddf Merge: eb5c141 2e2ba95 Author: Brad KingAuthorDate: Wed Oct 19 09:51:51 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 09:51:51 2016 -0400 Merge topic 'vs-csharp-prep' into next 2e2ba95c VS: Add internal API for detecting "managed" projects 5618f712 VS: Add CSharp project uuid and file extension https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e2ba95cb9d7806219c76773e81f91056e83077f commit 2e2ba95cb9d7806219c76773e81f91056e83077f Author: Michael Stürmer AuthorDate: Fri Sep 23 12:15:40 2016 +0200 Commit: Brad King CommitDate: Wed Oct 19 09:43:01 2016 -0400 VS: Add internal API for detecting "managed" projects This is in preparation for adding CSharp language support to the VS generator. diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index 9badda6..4be183d 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -137,6 +137,11 @@ bool cmVisualStudioGeneratorOptions::IsWinRt() const return this->FlagMap.find("CompileAsWinRT") != this->FlagMap.end(); } +bool cmVisualStudioGeneratorOptions::IsManaged() const +{ + return this->FlagMap.find("CompileAsManaged") != this->FlagMap.end(); +} + bool cmVisualStudioGeneratorOptions::UsingUnicode() const { // Look for the a _UNICODE definition. diff --git a/Source/cmVisualStudioGeneratorOptions.h b/Source/cmVisualStudioGeneratorOptions.h index 4eeae3d..0a0b96d 100644 --- a/Source/cmVisualStudioGeneratorOptions.h +++ b/Source/cmVisualStudioGeneratorOptions.h @@ -49,6 +49,7 @@ public: bool IsDebug() const; bool IsWinRt() const; + bool IsManaged() const; // Write options to output. void OutputPreprocessorDefinitions(std::ostream& fout, const char* prefix, const char* suffix, https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5618f7123d9ed3667d5cb53a05779d10ae6438ff commit 5618f7123d9ed3667d5cb53a05779d10ae6438ff Author: Michael Stürmer AuthorDate: Fri Sep 23 12:15:40 2016 +0200 Commit: Brad King CommitDate: Wed Oct 19 09:39:30 2016 -0400 VS: Add CSharp project uuid and file extension This is in preparation for adding CSharp language support to the VS generator. diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index ffd87e2..1fa2741 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -159,6 +159,10 @@ void cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout, ext = ".vfproj"; project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \""; } + if (this->TargetIsCSharpOnly(t)) { +ext = ".csproj"; +project = "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \""; + } const char* targetExt = t->GetProperty("GENERATOR_FILE_NAME_EXT"); if (targetExt) { ext = targetExt; diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 6296dd2..151d1d3 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -734,6 +734,30 @@ bool cmGlobalVisualStudioGenerator::TargetIsFortranOnly( return false; } +bool cmGlobalVisualStudioGenerator::TargetIsCSharpOnly( + cmGeneratorTarget const* gt) +{ + if (gt->GetType() > cmState::OBJECT_LIBRARY) { +return false; + } + // check to see if this is a C# build + std::set languages; + { +// Issue diagnostic if the source files depend on the config. +std::vector sources; +if (!gt->GetConfigCommonSourceFiles(sources)) { + return false; +} + } + gt->GetLanguages(languages, ""); + if (languages.size() == 1) { +if (*languages.begin() == "CSharp") { + return true; +} + } + return false; +} + bool cmGlobalVisualStudioGenerator::TargetCompare::operator()( cmGeneratorTarget const* l, cmGeneratorTarget const* r)
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-644-g50eb6cf
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 50eb6cf42322dafb0b9f53ac02f956e69a4be188 (commit) via bd4f7bd88af4dd062f953b8f102e55aca098edc1 (commit) from db659b69cddd639e4c44bdb4e4d53a06e424fc8b (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=50eb6cf42322dafb0b9f53ac02f956e69a4be188 commit 50eb6cf42322dafb0b9f53ac02f956e69a4be188 Merge: db659b6 bd4f7bd Author: Stephen KellyAuthorDate: Wed Oct 19 09:40:45 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 09:40:45 2016 -0400 Merge topic 'split-cmState' into next bd4f7bd8 Fix style https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd4f7bd88af4dd062f953b8f102e55aca098edc1 commit bd4f7bd88af4dd062f953b8f102e55aca098edc1 Author: Stephen Kelly AuthorDate: Wed Oct 19 15:39:12 2016 +0200 Commit: Stephen Kelly CommitDate: Wed Oct 19 15:40:17 2016 +0200 Fix style diff --git a/Source/cmTargetPropertyComputer.cxx b/Source/cmTargetPropertyComputer.cxx index 0839439..36d1940 100644 --- a/Source/cmTargetPropertyComputer.cxx +++ b/Source/cmTargetPropertyComputer.cxx @@ -83,8 +83,8 @@ bool cmTargetPropertyComputer::WhiteListedInterfaceProperty( } bool cmTargetPropertyComputer::PassesWhitelist( - cmStateEnums::TargetType tgtType, std::string const& prop, cmMessenger* messenger, - cmListFileBacktrace const& context) + cmStateEnums::TargetType tgtType, std::string const& prop, + cmMessenger* messenger, cmListFileBacktrace const& context) { if (tgtType == cmStateEnums::INTERFACE_LIBRARY && !WhiteListedInterfaceProperty(prop)) { --- Summary of changes: Source/cmTargetPropertyComputer.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-622-g8554cb7
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 8554cb72c124ac87e63e3da1d23f9795c7b42f2e (commit) via e89fbfaf6626b0693cc597ce4e705d87b8faf996 (commit) via 64aa29b7d682c333653ee4720e07914396ec3da7 (commit) from f05a7d0668b7d1f6e540e9478332eeff04090c23 (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=8554cb72c124ac87e63e3da1d23f9795c7b42f2e commit 8554cb72c124ac87e63e3da1d23f9795c7b42f2e Merge: f05a7d0 e89fbfa Author: Brad KingAuthorDate: Wed Oct 19 09:09:49 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 09:09:49 2016 -0400 Merge topic 'external-project-clone-progress' into next e89fbfaf ExternalProject: support GIT_PROGRESS argument 64aa29b7 ExternalProject: fix typo https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e89fbfaf6626b0693cc597ce4e705d87b8faf996 commit e89fbfaf6626b0693cc597ce4e705d87b8faf996 Author: Ben Boeckel AuthorDate: Tue Oct 18 11:31:04 2016 -0400 Commit: Ben Boeckel CommitDate: Tue Oct 18 17:41:02 2016 -0400 ExternalProject: support GIT_PROGRESS argument diff --git a/Help/release/dev/external-project-clone-progress.rst b/Help/release/dev/external-project-clone-progress.rst new file mode 100644 index 000..766a1a3 --- /dev/null +++ b/Help/release/dev/external-project-clone-progress.rst @@ -0,0 +1,5 @@ +external-project-clone-progress +--- + +* The :module:`ExternalProject` module gained the ``GIT_PROGRESS`` option to + force Git to show progress when cloning repositories. diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index a56f64c..9694563 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -68,6 +68,11 @@ Create custom targets to build projects in external trees Tell Git to clone with ``--depth 1``. Use when ``GIT_TAG`` is not specified or when it names a branch in order to download only the tip of the branch without the rest of its history. + ``GIT_PROGRESS 1`` +Tell Git to clone with ``--progress``. For large projects, the clone step +does not output anything which can make the build appear to have stalled. +This option forces Git to output progress information during the clone step +so that forward progress is indicated. ``HG_REPOSITORY `` URL of mercurial repo ``HG_TAG `` @@ -509,7 +514,7 @@ define_property(DIRECTORY PROPERTY "EP_UPDATE_DISCONNECTED" INHERITED "ExternalProject module." ) -function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_remote_name git_submodules git_shallow src_name work_dir gitclone_infofile gitclone_stampfile tls_verify) +function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_remote_name git_submodules git_shallow git_progress src_name work_dir gitclone_infofile gitclone_stampfile tls_verify) if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.10) set(git_clone_shallow_options "--depth 1 --no-single-branch") else() @@ -555,6 +560,11 @@ if(git_shallow) list(APPEND git_clone_options ${git_clone_shallow_options}) endif() +set(git_progress \"${git_progress}\") +if(git_progress) + list(APPEND git_clone_options --progress) +endif() + # try the clone 3 times incase there is an odd git clone issue set(error_code 1) set(number_of_tries 0) @@ -1795,6 +1805,7 @@ function(_ep_add_download_command name) set(tls_verify "${CMAKE_TLS_VERIFY}") endif() get_property(git_shallow TARGET ${name} PROPERTY _EP_GIT_SHALLOW) +get_property(git_progress TARGET ${name} PROPERTY _EP_GIT_PROGRESS) # For the download step, and the git clone operation, only the repository # should be recorded in a configured RepositoryInfo file. If the repo @@ -1819,7 +1830,7 @@ function(_ep_add_download_command name) # The script will delete the source directory and then call git clone. # _ep_write_gitclone_script(${tmp_dir}/${name}-gitclone.cmake ${source_dir} - ${GIT_EXECUTABLE} ${git_repository} ${git_tag} ${git_remote_name} "${git_submodules}" "${git_shallow}" ${src_name} ${work_dir} + ${GIT_EXECUTABLE} ${git_repository} ${git_tag} ${git_remote_name} "${git_submodules}" "${git_shallow}" "${git_progress}" ${src_name} ${work_dir} ${stamp_dir}/${name}-gitinfo.txt ${stamp_dir}/${name}-gitclone-lastrun.txt "${tls_verify}" ) set(comment "Performing download step (git clone) for '${name}'")
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-619-gf05a7d0
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 f05a7d0668b7d1f6e540e9478332eeff04090c23 (commit) via 3a9e92bce1c10e0082d431a61e100485fd6cf270 (commit) from fe5e4f05abf1b557c226395271a0e4eff61631ab (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=f05a7d0668b7d1f6e540e9478332eeff04090c23 commit f05a7d0668b7d1f6e540e9478332eeff04090c23 Merge: fe5e4f0 3a9e92b Author: Brad KingAuthorDate: Wed Oct 19 09:01:07 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 09:01:07 2016 -0400 Merge topic 'ninja-only-object-rules' into next 3a9e92bc Ninja: Add compile rules only for languages that are actually compiled https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a9e92bce1c10e0082d431a61e100485fd6cf270 commit 3a9e92bce1c10e0082d431a61e100485fd6cf270 Author: Brad King AuthorDate: Tue Oct 18 15:35:10 2016 -0400 Commit: Brad King CommitDate: Tue Oct 18 15:35:10 2016 -0400 Ninja: Add compile rules only for languages that are actually compiled In `WriteLanguageRules` we collect all languages used for source files in a target. However, this only needs to include sources that are actually going to be compiled into object files. No object file build statements will be generated for other sources. This avoids generating language compile rules for source files that are not compiled due to being marked as `HEADER_FILE_ONLY`. Issue: #16373 diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index b28b19a..80d6d93 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -106,10 +106,11 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules() // Write rules for languages compiled in this target. std::set languages; - std::vector sourceFiles; - this->GetGeneratorTarget()->GetSourceFiles( + std::vector sourceFiles; + this->GetGeneratorTarget()->GetObjectSources( sourceFiles, this->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE")); - for (std::vector ::const_iterator i = sourceFiles.begin(); + for (std::vector::const_iterator i = + sourceFiles.begin(); i != sourceFiles.end(); ++i) { const std::string& lang = (*i)->GetLanguage(); if (!lang.empty()) { --- Summary of changes: Source/cmNinjaNormalTargetGenerator.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-617-gfe5e4f0
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 fe5e4f05abf1b557c226395271a0e4eff61631ab (commit) via 3b67ffe4ab6e876ec8cda1b4e1298b73ea022e28 (commit) via 876da11858ab6649bb088c4bb7758fc84910ba20 (commit) from 0bbc70a7015b0ce837172f324fbe09f0f82efe57 (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=fe5e4f05abf1b557c226395271a0e4eff61631ab commit fe5e4f05abf1b557c226395271a0e4eff61631ab Merge: 0bbc70a 3b67ffe Author: Brad KingAuthorDate: Wed Oct 19 08:53:40 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 08:53:40 2016 -0400 Merge topic 'test-release' into next 3b67ffe4 Merge branch 'release' into test-release 876da118 CMake 3.7.0-rc2 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b67ffe4ab6e876ec8cda1b4e1298b73ea022e28 commit 3b67ffe4ab6e876ec8cda1b4e1298b73ea022e28 Merge: aa10572 876da11 Author: Brad King AuthorDate: Wed Oct 19 08:53:31 2016 -0400 Commit: Brad King CommitDate: Wed Oct 19 08:53:31 2016 -0400 Merge branch 'release' into test-release https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=876da11858ab6649bb088c4bb7758fc84910ba20 commit 876da11858ab6649bb088c4bb7758fc84910ba20 Author: Brad King AuthorDate: Wed Oct 19 08:53:08 2016 -0400 Commit: Brad King CommitDate: Wed Oct 19 08:53:08 2016 -0400 CMake 3.7.0-rc2 diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 6cb0fea..d8c77fc 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,4 +2,4 @@ set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 7) set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 1) +set(CMake_VERSION_RC 2) --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.7.0-rc1-63-ga0c539b
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, release has been updated via a0c539b5460da283433976053ea181f07fcea32e (commit) via 9af881d810d464a357c8bac5eb4423aa970fffb6 (commit) via 6739d24030b7cb593be5557349ee6678b58bcc5a (commit) via 06c396126fb7734326075b56c859330a31ba5707 (commit) via 074999171cfcf21679a9417ef097df6a21fd3924 (commit) via e3cb3116bca6e0dd6cc5976fa927221a406ffe3d (commit) via 615f3ed2b43129bd7d2466d369beef3003e1e0de (commit) via fdce782b61c6a1501b6ea2459c659d9a42bae59b (commit) via 9112c43ebc96c8ea25042520f769cb1575439c22 (commit) from df68d8a17ed14b6c5a38dca9c95d88bcc6da243c (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 - --- Summary of changes: Modules/ExternalProject.cmake| 17 + Modules/Platform/Android-Determine.cmake |2 +- Source/cmServerConnection.cxx| 11 +-- Tests/CMakeLists.txt |3 +++ Tests/VSNsightTegra/CMakeLists.txt |2 +- 5 files changed, 19 insertions(+), 16 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-614-g0bbc70a
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 0bbc70a7015b0ce837172f324fbe09f0f82efe57 (commit) via aa105725152defd75b11a96e27db8b28b9e884a5 (commit) via a0c539b5460da283433976053ea181f07fcea32e (commit) via 074999171cfcf21679a9417ef097df6a21fd3924 (commit) via e3cb3116bca6e0dd6cc5976fa927221a406ffe3d (commit) from 461687855df695039f4ba6714dea62fa7a51315e (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=0bbc70a7015b0ce837172f324fbe09f0f82efe57 commit 0bbc70a7015b0ce837172f324fbe09f0f82efe57 Merge: 4616878 aa10572 Author: Brad KingAuthorDate: Wed Oct 19 08:51:41 2016 -0400 Commit: Brad King CommitDate: Wed Oct 19 08:51:41 2016 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.0-rc1-309-gaa10572
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, master has been updated via aa105725152defd75b11a96e27db8b28b9e884a5 (commit) via a0c539b5460da283433976053ea181f07fcea32e (commit) via 074999171cfcf21679a9417ef097df6a21fd3924 (commit) via e3cb3116bca6e0dd6cc5976fa927221a406ffe3d (commit) from a08a48c2da1ad0aa760c127511fb96c92d7890af (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 - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-609-g4616878
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 461687855df695039f4ba6714dea62fa7a51315e (commit) via a08a48c2da1ad0aa760c127511fb96c92d7890af (commit) via c61b6f7f37386eb06bb50d9fc25cb40efe44c9cc (commit) via 1745733809ebb31640b4f9205f2eee96e932e995 (commit) via 050ef26061b6b73cc7c48dd8e7180ee0e7d5c073 (commit) via 674d76538e4f51f89a7a1a3746b32e6d7519568a (commit) from b59659da1784db4997e7def4ea322a06672f15f7 (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=461687855df695039f4ba6714dea62fa7a51315e commit 461687855df695039f4ba6714dea62fa7a51315e Merge: b59659d a08a48c Author: Brad KingAuthorDate: Wed Oct 19 08:48:56 2016 -0400 Commit: Brad King CommitDate: Wed Oct 19 08:48:56 2016 -0400 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.0-rc1-300-g1745733
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, master has been updated via 1745733809ebb31640b4f9205f2eee96e932e995 (commit) via 9af881d810d464a357c8bac5eb4423aa970fffb6 (commit) via 6739d24030b7cb593be5557349ee6678b58bcc5a (commit) via 06c396126fb7734326075b56c859330a31ba5707 (commit) from 050ef26061b6b73cc7c48dd8e7180ee0e7d5c073 (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=1745733809ebb31640b4f9205f2eee96e932e995 commit 1745733809ebb31640b4f9205f2eee96e932e995 Merge: 050ef26 9af881d Author: Brad KingAuthorDate: Wed Oct 19 08:48:31 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 08:48:31 2016 -0400 Merge topic 'fix-Android-NsightTegra' 9af881d8 Tests: Add VSNsightTegra test for VS 2015 6739d240 Tests: Fix VSNsightTegra test on Android NDK r12b 06c39612 VS: Fix NVIDIA Nsight Tegra Visual Studio Edition support --- Summary of changes: Modules/Platform/Android-Determine.cmake |2 +- Tests/CMakeLists.txt |3 +++ Tests/VSNsightTegra/CMakeLists.txt |2 +- 3 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.0-rc1-296-g050ef26
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, master has been updated via 050ef26061b6b73cc7c48dd8e7180ee0e7d5c073 (commit) via 9112c43ebc96c8ea25042520f769cb1575439c22 (commit) from 674d76538e4f51f89a7a1a3746b32e6d7519568a (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=050ef26061b6b73cc7c48dd8e7180ee0e7d5c073 commit 050ef26061b6b73cc7c48dd8e7180ee0e7d5c073 Merge: 674d765 9112c43 Author: Brad KingAuthorDate: Wed Oct 19 08:48:27 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 08:48:27 2016 -0400 Merge topic 'cmake-server-pipe-mode-fix' 9112c43e server-mode: Fix named pipe mode --- Summary of changes: Source/cmServerConnection.cxx | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.0-rc1-305-ga08a48c
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, master has been updated via a08a48c2da1ad0aa760c127511fb96c92d7890af (commit) via 615f3ed2b43129bd7d2466d369beef3003e1e0de (commit) via fdce782b61c6a1501b6ea2459c659d9a42bae59b (commit) from c61b6f7f37386eb06bb50d9fc25cb40efe44c9cc (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=a08a48c2da1ad0aa760c127511fb96c92d7890af commit a08a48c2da1ad0aa760c127511fb96c92d7890af Merge: c61b6f7 615f3ed Author: Brad KingAuthorDate: Wed Oct 19 08:48:40 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 08:48:40 2016 -0400 Merge topic 'external-project-source-subdir-usage' 615f3ed2 ExternalProject: make SOURCE_SUBDIR directly appendable fdce782b ExternalProject: error out only if the property is unset --- Summary of changes: Modules/ExternalProject.cmake | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.0-rc1-302-gc61b6f7
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, master has been updated via c61b6f7f37386eb06bb50d9fc25cb40efe44c9cc (commit) via 33a9aaa89b437da29a70f27d25b267242b6f982c (commit) from 1745733809ebb31640b4f9205f2eee96e932e995 (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=c61b6f7f37386eb06bb50d9fc25cb40efe44c9cc commit c61b6f7f37386eb06bb50d9fc25cb40efe44c9cc Merge: 1745733 33a9aaa Author: Brad KingAuthorDate: Wed Oct 19 08:48:37 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 19 08:48:37 2016 -0400 Merge topic 'ExternalData-multiple-hashes' 33a9aaa8 ExternalData: Add support for multiple hash algorithms --- Summary of changes: Help/release/dev/ExternalData-multiple-hashes.rst |7 ++ Modules/ExternalData.cmake | 110 Tests/Module/ExternalData/CMakeLists.txt |2 + .../ExternalData/MultipleAlgorithmNoMD5.dat.md5|1 + 2.dat.sha1 => MultipleAlgorithmNoMD5.dat.sha1} |0 ...Top.dat.md5 => MultipleAlgorithmNoSHA1.dat.md5} |0 .../ExternalData/MultipleAlgorithmNoSHA1.dat.sha1 |1 + 7 files changed, 102 insertions(+), 19 deletions(-) create mode 100644 Help/release/dev/ExternalData-multiple-hashes.rst create mode 100644 Tests/Module/ExternalData/MultipleAlgorithmNoMD5.dat.md5 copy Tests/Module/ExternalData/{SeriesMixed.2.dat.sha1 => MultipleAlgorithmNoMD5.dat.sha1} (100%) copy Tests/Module/ExternalData/{MetaTop.dat.md5 => MultipleAlgorithmNoSHA1.dat.md5} (100%) create mode 100644 Tests/Module/ExternalData/MultipleAlgorithmNoSHA1.dat.sha1 hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits