[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-357-g5448f00
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 5448f0068cc4e228a7481905412fc956e239a827 (commit) from fdd0ce915c0ab7e5a9f3b95612b35d845a7a5213 (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=5448f0068cc4e228a7481905412fc956e239a827 commit 5448f0068cc4e228a7481905412fc956e239a827 Author: Kitware Robot AuthorDate: Thu Oct 27 00:01:05 2016 -0400 Commit: Kitware Robot CommitDate: Thu Oct 27 00:01:05 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ea6bdad..195acba 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 20161026) +set(CMake_VERSION_PATCH 20161027) #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-773-gafb0f66
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 afb0f66f0f47813de8c9a77659326a8923a6e1c2 (commit) via 05e05cd2aae9d00d2ed89a4f0cb9ef2f2976ae80 (commit) from a3dab54134c6bd015edcc55d88a74204836649ca (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=afb0f66f0f47813de8c9a77659326a8923a6e1c2 commit afb0f66f0f47813de8c9a77659326a8923a6e1c2 Merge: a3dab54 05e05cd Author: Brad King AuthorDate: Wed Oct 26 15:04:23 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 26 15:04:23 2016 -0400 Merge topic 'intel-compiler-windows-c++98' into next 05e05cd2 Intel: Fix compiler C++98 standard flag on Windows https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05e05cd2aae9d00d2ed89a4f0cb9ef2f2976ae80 commit 05e05cd2aae9d00d2ed89a4f0cb9ef2f2976ae80 Author: Brad King AuthorDate: Wed Oct 26 14:56:57 2016 -0400 Commit: Brad King CommitDate: Wed Oct 26 15:03:53 2016 -0400 Intel: Fix compiler C++98 standard flag on Windows The Intel C++ Compiler for Windows does not support the `-Qstd=c++98` flag but does support `-Qstd=gnu++98`. Issue: #16384 diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake index 73dd7fa..29e02d3 100644 --- a/Modules/Compiler/Intel-CXX.cmake +++ b/Modules/Compiler/Intel-CXX.cmake @@ -34,7 +34,11 @@ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1) endif() if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1) - set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=c++98") + if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") +set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=gnu++98") + else() +set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=c++98") + endif() set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "${_std}=${_ext}98") endif() --- Summary of changes: Modules/Compiler/Intel-CXX.cmake |6 +- 1 file changed, 5 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.0-rc2-771-ga3dab54
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 a3dab54134c6bd015edcc55d88a74204836649ca (commit) via 335a29cb07a8d014a9ed4d4dbf25e49da3a78b33 (commit) from 0ab2c473c7c04905a0a791e0c2897ed74c51eb4b (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=a3dab54134c6bd015edcc55d88a74204836649ca commit a3dab54134c6bd015edcc55d88a74204836649ca Merge: 0ab2c47 335a29c Author: Brad King AuthorDate: Wed Oct 26 11:21:35 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 26 11:21:35 2016 -0400 Merge topic 'consoleBuf' into next 335a29cb Enable Unicode output to Windows consoles https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=335a29cb07a8d014a9ed4d4dbf25e49da3a78b33 commit 335a29cb07a8d014a9ed4d4dbf25e49da3a78b33 Author: Dāvis Mosāns AuthorDate: Sat Oct 1 03:11:35 2016 +0300 Commit: Dāvis Mosāns CommitDate: Wed Oct 26 17:02:37 2016 +0300 Enable Unicode output to Windows consoles Use KWSys ConsoleBuf to replace the `streambuf` on `std::cout` and `std::cerr` so that process output can be encoded correctly for display in a Windows console. diff --git a/CMakeLists.txt b/CMakeLists.txt index b8a635f..1bc4b4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,6 +260,7 @@ macro (CMAKE_BUILD_UTILITIES) set(KWSYS_USE_MD5 1) set(KWSYS_USE_Process 1) set(KWSYS_USE_CommandLineArguments 1) + set(KWSYS_USE_ConsoleBuf 1) set(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source) set(KWSYS_INSTALL_DOC_DIR "${CMAKE_DOC_DIR}") add_subdirectory(Source/kwsys) diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index b06bd38..06472c6 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -17,6 +17,9 @@ #include #include +#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE) +#include +#endif #include #include #include @@ -84,6 +87,11 @@ int cpackDefinitionArgument(const char* argument, const char* cValue, // this is CPack. int main(int argc, char const* const* argv) { +#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE) + // Replace streambuf so we can output Unicode to console + cmsys::ConsoleBuf::Manager consoleOut(std::cout); + cmsys::ConsoleBuf::Manager consoleErr(std::cerr, true); +#endif cmsys::Encoding::CommandLineArguments args = cmsys::Encoding::CommandLineArguments::Main(argc, argv); argc = args.argc(); diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index d1159c3..44af966 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -18,6 +18,9 @@ #include #include +#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE) +#include +#endif #include #include #include @@ -153,6 +156,11 @@ static void cmakemainProgressCallback(const char* m, float prog, int main(int ac, char const* const* av) { +#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE) + // Replace streambuf so we can output Unicode to console + cmsys::ConsoleBuf::Manager consoleOut(std::cout); + cmsys::ConsoleBuf::Manager consoleErr(std::cerr, true); +#endif cmsys::Encoding::CommandLineArguments args = cmsys::Encoding::CommandLineArguments::Main(ac, av); ac = args.argc(); diff --git a/Source/ctest.cxx b/Source/ctest.cxx index 8ab17b9..1acd240 100644 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@ -10,6 +10,9 @@ #include "cmake.h" #include +#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE) +#include +#endif #include #include #include @@ -110,6 +113,11 @@ static const char* cmDocumentationOptions[][2] = { // this is a test driver program for cmCTest. int main(int argc, char const* const* argv) { +#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE) + // Replace streambuf so we can output Unicode to console + cmsys::ConsoleBuf::Manager consoleOut(std::cout); + cmsys::ConsoleBuf::Manager consoleErr(std::cerr, true); +#endif cmsys::Encoding::CommandLineArguments encoding_args = cmsys::Encoding::CommandLineArguments::Main(argc, argv); argc = encoding_args.argc(); --- Summary of changes: CMakeLists.txt |1 + Source/CPack/cpack.cxx |8 Source/cmakemain.cxx |8 Source/ctest.cxx |8 4 files changed, 25 insertions(+) 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-rc2-349-g1c8b99c
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 1c8b99ce0b8e3a7a78b029a0cf18dc7256be6aee (commit) via 68e7250a9facbe7b82cff17af3bf2a831e481f3c (commit) from 9d203c0051bbec48dfbee90940e6faff87a2bdeb (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=1c8b99ce0b8e3a7a78b029a0cf18dc7256be6aee commit 1c8b99ce0b8e3a7a78b029a0cf18dc7256be6aee Merge: 9d203c0 68e7250 Author: Brad King AuthorDate: Wed Oct 26 09:28:13 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 26 09:28:13 2016 -0400 Merge topic 'fix-right-angle-bracket-feature-test' 68e7250a Features: Fix cxx_right_angle_brackets compiler feature test --- Summary of changes: Tests/CompileFeatures/cxx_right_angle_brackets.cpp |4 +++- Utilities/Scripts/clang-format.bash|1 + 2 files changed, 4 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.0-rc2-769-g0ab2c47
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 0ab2c473c7c04905a0a791e0c2897ed74c51eb4b (commit) via fdd0ce915c0ab7e5a9f3b95612b35d845a7a5213 (commit) via fa15858a7eee3a6feb84bd39b01478c2116ab21e (commit) via 1c8b99ce0b8e3a7a78b029a0cf18dc7256be6aee (commit) via 9d203c0051bbec48dfbee90940e6faff87a2bdeb (commit) from 6738d19b2c8a64709fac9544f9df28be6531ac88 (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=0ab2c473c7c04905a0a791e0c2897ed74c51eb4b commit 0ab2c473c7c04905a0a791e0c2897ed74c51eb4b Merge: 6738d19 fdd0ce9 Author: Brad King AuthorDate: Wed Oct 26 09:28:28 2016 -0400 Commit: Brad King CommitDate: Wed Oct 26 09:28:28 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-rc2-352-gfa15858
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 fa15858a7eee3a6feb84bd39b01478c2116ab21e (commit) via 51cfba8c219a923c924349cd255a523eb797e104 (commit) via 53862f04a0002894c0ef5aeb23d52495e5abe60d (commit) from 1c8b99ce0b8e3a7a78b029a0cf18dc7256be6aee (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=fa15858a7eee3a6feb84bd39b01478c2116ab21e commit fa15858a7eee3a6feb84bd39b01478c2116ab21e Merge: 1c8b99c 51cfba8 Author: Brad King AuthorDate: Wed Oct 26 09:28:16 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 26 09:28:16 2016 -0400 Merge topic 'update-kwsys' 51cfba8c Merge branch 'upstream-KWSys' into update-kwsys 53862f04 KWSys 2016-10-23 (b630d2f5) --- Summary of changes: Source/kwsys/ConsoleBuf.hxx.in | 16 1 file changed, 12 insertions(+), 4 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-rc2-356-gfdd0ce9
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 fdd0ce915c0ab7e5a9f3b95612b35d845a7a5213 (commit) via 69fc7bf87db33d88af02602fba811b5c5e740a70 (commit) via e2ed9a70929092ab7b32e036886859e53fbff897 (commit) via 584ab5285b51945e0dd523caf77342985ac97ce4 (commit) from fa15858a7eee3a6feb84bd39b01478c2116ab21e (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=fdd0ce915c0ab7e5a9f3b95612b35d845a7a5213 commit fdd0ce915c0ab7e5a9f3b95612b35d845a7a5213 Merge: fa15858 69fc7bf Author: Brad King AuthorDate: Wed Oct 26 09:28:19 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 26 09:28:19 2016 -0400 Merge topic 'vs-toolset-options' 69fc7bf8 VS: Choose flag map based on the toolset name e2ed9a70 VS: Move toolset flag table lookup to global generator 584ab528 VS: Add internal API to get platform toolset as string --- Summary of changes: Source/CMakeLists.txt |2 + Source/cmGlobalVisualStudio10Generator.cxx | 63 - Source/cmGlobalVisualStudio10Generator.h | 14 +++ Source/cmGlobalVisualStudio11Generator.cxx | 10 ++ Source/cmGlobalVisualStudio12Generator.cxx | 10 ++ Source/cmGlobalVisualStudio14Generator.cxx | 10 ++ Source/cmGlobalVisualStudio15Generator.cxx |2 + Source/cmVisualStudio10TargetGenerator.cxx | 141 Source/cmVisualStudio10TargetGenerator.h |6 -- Source/cmVisualStudio10ToolsetOptions.cxx | 134 ++ Source/cmVisualStudio10ToolsetOptions.h| 33 +++ 11 files changed, 293 insertions(+), 132 deletions(-) create mode 100644 Source/cmVisualStudio10ToolsetOptions.cxx create mode 100644 Source/cmVisualStudio10ToolsetOptions.h 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-764-g6738d19
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 6738d19b2c8a64709fac9544f9df28be6531ac88 (commit) via 554b4f9010add22ef83bb22858f9fdcb52afbc7e (commit) from 1563b936fd11bb6512d7365a070a6185ffc9fbaf (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=6738d19b2c8a64709fac9544f9df28be6531ac88 commit 6738d19b2c8a64709fac9544f9df28be6531ac88 Merge: 1563b93 554b4f9 Author: Brad King AuthorDate: Wed Oct 26 09:22:03 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 26 09:22:03 2016 -0400 Merge topic 'intel-17-features' into next 554b4f90 Features: Record features for Intel C++ 17 on UNIX https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=554b4f9010add22ef83bb22858f9fdcb52afbc7e commit 554b4f9010add22ef83bb22858f9fdcb52afbc7e Author: Brad King AuthorDate: Wed Oct 26 09:10:24 2016 -0400 Commit: Brad King CommitDate: Wed Oct 26 09:18:38 2016 -0400 Features: Record features for Intel C++ 17 on UNIX Issue: #16384 diff --git a/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/Modules/Compiler/Intel-CXX-FeatureTests.cmake index e111c07..57a05c8 100644 --- a/Modules/Compiler/Intel-CXX-FeatureTests.cmake +++ b/Modules/Compiler/Intel-CXX-FeatureTests.cmake @@ -1,6 +1,7 @@ # References: # - https://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler # - https://software.intel.com/en-us/articles/c14-features-supported-by-intel-c-compiler +# - http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0096r3.html # FIXME: Intel C++ feature detection works only when simulating the GNU compiler. # When simulating MSVC, Intel always sets __cplusplus to 199711L. @@ -8,9 +9,8 @@ if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") return() endif() -# these are not implemented in any version at time of writing -#set(_cmake_feature_test_cxx_variable_templates "${Intel15_CXX14}") -#set(_cmake_feature_test_cxx_relaxed_constexpr "${Intel15_CXX14}") +set(_cmake_feature_test_cxx_variable_templates "__cpp_variable_templates >= 201304") +set(_cmake_feature_test_cxx_relaxed_constexpr "__cpp_constexpr >= 201304") set(_cmake_oldestSupported "__INTEL_COMPILER >= 1210") set(DETECT_CXX11 "((__cplusplus >= 201103L) || defined(__INTEL_CXX11_MODE__) || defined(__GXX_EXPERIMENTAL_CXX0X__))") --- Summary of changes: Modules/Compiler/Intel-CXX-FeatureTests.cmake |6 +++--- 1 file changed, 3 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-rc2-762-g1563b93
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 1563b936fd11bb6512d7365a070a6185ffc9fbaf (commit) via 85f893c0535538991218b8caaafe3ff871017b29 (commit) via bf111520211ec74ab847b7fa11637b702af2e8ca (commit) from 5521217d66f57464ac4ecf715527682f5148f356 (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=1563b936fd11bb6512d7365a070a6185ffc9fbaf commit 1563b936fd11bb6512d7365a070a6185ffc9fbaf Merge: 5521217 85f893c Author: Daniel Pfeifer AuthorDate: Wed Oct 26 03:03:24 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 26 03:03:24 2016 -0400 Merge topic 'include-what-you-use' into next 85f893c0 fixup! Include necessary headers in commands bf111520 fixup! Include necessary headers in commands https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85f893c0535538991218b8caaafe3ff871017b29 commit 85f893c0535538991218b8caaafe3ff871017b29 Author: Daniel Pfeifer AuthorDate: Wed Oct 26 09:01:56 2016 +0200 Commit: Daniel Pfeifer CommitDate: Wed Oct 26 09:01:56 2016 +0200 fixup! Include necessary headers in commands diff --git a/Source/cmEndWhileCommand.cxx b/Source/cmEndWhileCommand.cxx index f24c280..5623f33 100644 --- a/Source/cmEndWhileCommand.cxx +++ b/Source/cmEndWhileCommand.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmEndWhileCommand.h" -#include "cmListFileArgument.h" +#include "cmListFileCache.h" class cmExecutionStatus; https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf111520211ec74ab847b7fa11637b702af2e8ca commit bf111520211ec74ab847b7fa11637b702af2e8ca Author: Daniel Pfeifer AuthorDate: Wed Oct 26 08:58:37 2016 +0200 Commit: Daniel Pfeifer CommitDate: Wed Oct 26 08:58:37 2016 +0200 fixup! Include necessary headers in commands diff --git a/Source/cmEndWhileCommand.cxx b/Source/cmEndWhileCommand.cxx index 48f09f1..f24c280 100644 --- a/Source/cmEndWhileCommand.cxx +++ b/Source/cmEndWhileCommand.cxx @@ -2,8 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmEndWhileCommand.h" +#include "cmListFileArgument.h" + class cmExecutionStatus; -struct cmListFileArgument; bool cmEndWhileCommand::InvokeInitialPass( std::vector const& args, cmExecutionStatus&) --- Summary of changes: Source/cmEndWhileCommand.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits