[Cmake-commits] CMake branch, master, updated. v3.7.1-834-g0c38000
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 0c38000393aef700b22a596e35c7975c7a7b1ad4 (commit) from 1dd3e21a54f684df876da6d778ed04535ebf10ee (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=0c38000393aef700b22a596e35c7975c7a7b1ad4 commit 0c38000393aef700b22a596e35c7975c7a7b1ad4 Author: Kitware Robot AuthorDate: Fri Dec 9 00:01:05 2016 -0500 Commit: Kitware Robot CommitDate: Fri Dec 9 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7f34ecd..7db770c 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 20161208) +set(CMake_VERSION_PATCH 20161209) #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.1-1656-gf4a9406
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 f4a9406513d4c0f1bdc825325e3691ab83fc6b7b (commit) via 5f457173b1c2fce6a6a8cb2c41ee34c750b07216 (commit) from 2170072ec502d612f62746e9ed1c960dec5fd714 (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=f4a9406513d4c0f1bdc825325e3691ab83fc6b7b commit f4a9406513d4c0f1bdc825325e3691ab83fc6b7b Merge: 2170072 5f45717 Author: Daniel Pfeifer AuthorDate: Thu Dec 8 19:51:53 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 8 19:51:53 2016 -0500 Merge topic 'rebuild-lexers' into next 5f457173 fixup! Regenerate lexer source code https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f457173b1c2fce6a6a8cb2c41ee34c750b07216 commit 5f457173b1c2fce6a6a8cb2c41ee34c750b07216 Author: Daniel Pfeifer AuthorDate: Fri Dec 9 01:50:40 2016 +0100 Commit: Daniel Pfeifer CommitDate: Fri Dec 9 01:50:40 2016 +0100 fixup! Regenerate lexer source code diff --git a/Source/cmExprLexer.cxx b/Source/cmExprLexer.cxx index 9261302..33a9662 100644 --- a/Source/cmExprLexer.cxx +++ b/Source/cmExprLexer.cxx @@ -1,3 +1,4 @@ +#include "cmStandardLexer.h" #line 2 "cmExprLexer.cxx" #line 4 "cmExprLexer.cxx" --- Summary of changes: Source/cmExprLexer.cxx |1 + 1 file changed, 1 insertion(+) 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.1-7-gf243a34
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 f243a34cce8e4591e913566d86c1a28dc3df7996 (commit) via 27431de1627d95329712f4af8362fcaf2667aad5 (commit) from 0d89c1e87cac3ae02bd2c9864588accbd406e919 (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/cmGlobalVisualStudio10Generator.cxx | 11 ++- 1 file changed, 10 insertions(+), 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.1-1652-g0d5a8f0
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 0d5a8f0895395eb5de14ff3678ba208f59e6ee96 (commit) via 1dd3e21a54f684df876da6d778ed04535ebf10ee (commit) via f243a34cce8e4591e913566d86c1a28dc3df7996 (commit) from b1776fc2a2dd1e7d4166ff713bf328ebf2e98a6a (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=0d5a8f0895395eb5de14ff3678ba208f59e6ee96 commit 0d5a8f0895395eb5de14ff3678ba208f59e6ee96 Merge: b1776fc 1dd3e21 Author: Brad King AuthorDate: Thu Dec 8 08:54:26 2016 -0500 Commit: Brad King CommitDate: Thu Dec 8 08:54:26 2016 -0500 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.1-833-g1dd3e21
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 1dd3e21a54f684df876da6d778ed04535ebf10ee (commit) via f243a34cce8e4591e913566d86c1a28dc3df7996 (commit) from 8acf5b78efe995662a832952e514fce09ace03fa (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, master, updated. v3.7.1-831-g8acf5b7
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 8acf5b78efe995662a832952e514fce09ace03fa (commit) via e438693e953b77ca12339f664518e28283c7ec64 (commit) from e9286c9e0f7b059cd2ba3da1bf392ab5cc70e4e3 (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=8acf5b78efe995662a832952e514fce09ace03fa commit 8acf5b78efe995662a832952e514fce09ace03fa Merge: e9286c9 e438693 Author: Brad King AuthorDate: Thu Dec 8 08:51:23 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 8 08:51:23 2016 -0500 Merge topic 'csharp_support_options_isdebug' e438693e VS: Teach option map IsDebug() method about C# projects --- Summary of changes: Source/cmVisualStudioGeneratorOptions.cxx | 12 +++- Source/cmVisualStudioGeneratorOptions.h |3 ++- 2 files changed, 13 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.1-1649-gb1776fc
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 b1776fc2a2dd1e7d4166ff713bf328ebf2e98a6a (commit) via 8acf5b78efe995662a832952e514fce09ace03fa (commit) via e9286c9e0f7b059cd2ba3da1bf392ab5cc70e4e3 (commit) via ba9fcedf6a66e524416d8822fe8873e88fac5ab6 (commit) via c46145c61b9e2bfb8c8ea893f95f31e2b480c0d3 (commit) from a46d43ca7cd96e70b45664f5ecd52ae79e5d (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=b1776fc2a2dd1e7d4166ff713bf328ebf2e98a6a commit b1776fc2a2dd1e7d4166ff713bf328ebf2e98a6a Merge: a46d43c 8acf5b7 Author: Brad King AuthorDate: Thu Dec 8 08:51:39 2016 -0500 Commit: Brad King CommitDate: Thu Dec 8 08:51:39 2016 -0500 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.1-829-ge9286c9
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 e9286c9e0f7b059cd2ba3da1bf392ab5cc70e4e3 (commit) via e326d8cf3eb2ac3f98fe5b4783b35c6141c006a9 (commit) from ba9fcedf6a66e524416d8822fe8873e88fac5ab6 (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=e9286c9e0f7b059cd2ba3da1bf392ab5cc70e4e3 commit e9286c9e0f7b059cd2ba3da1bf392ab5cc70e4e3 Merge: ba9fced e326d8c Author: Brad King AuthorDate: Thu Dec 8 08:51:11 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 8 08:51:11 2016 -0500 Merge topic 'cpack-deb-missing-file-utility-error' e326d8cf CPack/DEB shlibdep options depend on file utility --- Summary of changes: Modules/CPackDeb.cmake | 11 ++- 1 file changed, 10 insertions(+), 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.1-827-gba9fced
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 ba9fcedf6a66e524416d8822fe8873e88fac5ab6 (commit) via d42d3780ac1d62c7733affb9fd168a4e803634a2 (commit) via 27431de1627d95329712f4af8362fcaf2667aad5 (commit) from c46145c61b9e2bfb8c8ea893f95f31e2b480c0d3 (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=ba9fcedf6a66e524416d8822fe8873e88fac5ab6 commit ba9fcedf6a66e524416d8822fe8873e88fac5ab6 Merge: c46145c d42d378 Author: Brad King AuthorDate: Thu Dec 8 08:50:43 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 8 08:50:43 2016 -0500 Merge topic 'vs-fix-standalone-Windows7.1SDK-toolset-for-master' d42d3780 Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into vs-fix-standalone-Windows7.1SDK-toolset-for-master 27431de1 VS: Fix standalone Windows7.1SDK toolset selection --- Summary of changes: Source/cmGlobalVisualStudio10Generator.cxx | 11 ++- 1 file changed, 10 insertions(+), 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.1-1644-ga46d43c
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 a46d43ca7cd96e70b45664f5ecd52ae79e5d (commit) via c3b6b5babc0269a4b84093443bfb5ba273a6e11b (commit) from 3defab1f56082a7fbf51cca39d51ae9a3d232f86 (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=a46d43ca7cd96e70b45664f5ecd52ae79e5d commit a46d43ca7cd96e70b45664f5ecd52ae79e5d Merge: 3defab1 c3b6b5b Author: Brad King AuthorDate: Thu Dec 8 08:21:11 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 8 08:21:11 2016 -0500 Merge topic 'FindBoost-vs15' into next c3b6b5ba FindBoost: Add support for VS 2017 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3b6b5babc0269a4b84093443bfb5ba273a6e11b commit c3b6b5babc0269a4b84093443bfb5ba273a6e11b Author: Vic Luo AuthorDate: Wed Dec 7 10:37:18 2016 +0800 Commit: Brad King CommitDate: Thu Dec 8 08:20:08 2016 -0500 FindBoost: Add support for VS 2017 diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 184fb05..ce4f47c 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -427,7 +427,9 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret) elseif (GHSMULTI) set(_boost_COMPILER "-ghs") elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") -if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) +if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) + set(_boost_COMPILER "-vc150") +elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) set(_boost_COMPILER "-vc140") elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18) set(_boost_COMPILER "-vc120") @@ -882,7 +884,9 @@ macro(_Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar base else() set(_arch_suffix 32) endif() -if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) +if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) + list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-15.0) +elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-14.0) elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18) list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-12.0) --- 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.1-1642-g3defab1
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 3defab1f56082a7fbf51cca39d51ae9a3d232f86 (commit) via 95e6a82d1e640b2faafa99e2b359ad68bbfe0f43 (commit) from 4bba79ad0ceb753c87c268eb1b66dc3d818223f0 (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=3defab1f56082a7fbf51cca39d51ae9a3d232f86 commit 3defab1f56082a7fbf51cca39d51ae9a3d232f86 Merge: 4bba79a 95e6a82 Author: Brad King AuthorDate: Thu Dec 8 08:16:44 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 8 08:16:44 2016 -0500 Merge topic 'FindBoost-vs15' into next 95e6a82d FindBoost: Fix MSVC2017 compatibility https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95e6a82d1e640b2faafa99e2b359ad68bbfe0f43 commit 95e6a82d1e640b2faafa99e2b359ad68bbfe0f43 Author: Vic Luo AuthorDate: Wed Dec 7 10:37:18 2016 +0800 Commit: Vic Luo CommitDate: Wed Dec 7 10:37:18 2016 +0800 FindBoost: Fix MSVC2017 compatibility diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 9bd7a30..e6bf3dc 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -427,7 +427,9 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret) elseif (GHSMULTI) set(_boost_COMPILER "-ghs") elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") -if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) +if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) + set(_boost_COMPILER "-vc150") +elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) set(_boost_COMPILER "-vc140") elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18) set(_boost_COMPILER "-vc120") @@ -882,7 +884,9 @@ macro(_Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar base else() set(_arch_suffix 32) endif() -if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) +if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) + list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-15.0) +elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-14.0) elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18) list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-12.0) --- Summary of changes: Modules/FindBoost.cmake |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits