[Cmake-commits] CMake branch, master, updated. v3.9.0-rc5-274-g107a92e
Kitware Robot
kwrobot at kitware.com
Tue Jul 11 07:45:04 EDT 2017
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 107a92ea9a784d283b8d6d35a8c9bd93db8cd06d (commit)
via 79e72f4b7c18cdb758e945daff0f9d201625c8f6 (commit)
via de72d5dda6909093eb3fb6f8c0d53633e5bd9fdf (commit)
via 970569a941a3259f5303a5090ed7bca7bb6e6d7e (commit)
via a49b235db9036d5ec8c8535d2074c136eeb13254 (commit)
via 59e52b30416b3c1731ec56207baad2ef0295580b (commit)
via dd69dea3e7456cf8ea7e5d60362f6f8aa7aafa48 (commit)
via 2644e4c9fcc747d750d6a522d2b4029b172902c3 (commit)
via f7f721d40ae81b7c13afea3aa777b6be66af372c (commit)
via ecac50e133c339e4b4611631333f0f07e438c99d (commit)
via efaf987ad1569d5329fc60f5e1f47f3e8809bb69 (commit)
via c7d81e16cb0f2023098ca64e33a4408b8ba80287 (commit)
via 6b2bf5756bd01a955606f1963ad44bfde21f173f (commit)
from 8d5ec219288b05379f19a23a0a0b4c8b76a17712 (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=107a92ea9a784d283b8d6d35a8c9bd93db8cd06d
commit 107a92ea9a784d283b8d6d35a8c9bd93db8cd06d
Merge: 79e72f4 dd69dea
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 11 07:42:09 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 11 07:42:09 2017 -0400
Merge branch 'release-3.9'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79e72f4b7c18cdb758e945daff0f9d201625c8f6
commit 79e72f4b7c18cdb758e945daff0f9d201625c8f6
Merge: de72d5d 6b2bf57
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 11 11:39:11 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jul 11 07:39:15 2017 -0400
Merge topic 'FindMFC-try-static'
6b2bf575 FindMFC: Check for static MFC variant
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1034
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de72d5dda6909093eb3fb6f8c0d53633e5bd9fdf
commit de72d5dda6909093eb3fb6f8c0d53633e5bd9fdf
Merge: 970569a efaf987
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 11 11:38:50 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jul 11 07:38:54 2017 -0400
Merge topic 'file-LOCK-windows-message'
efaf987a cmFileLockResult: Avoid allocation for Windows error message
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1035
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=970569a941a3259f5303a5090ed7bca7bb6e6d7e
commit 970569a941a3259f5303a5090ed7bca7bb6e6d7e
Merge: a49b235 2644e4c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 11 11:37:13 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jul 11 07:37:42 2017 -0400
Merge topic 'vs-2017-choose-via-environment'
2644e4c9 VS: Choose VS 2017 instance via environment variable
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1030
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a49b235db9036d5ec8c8535d2074c136eeb13254
commit a49b235db9036d5ec8c8535d2074c136eeb13254
Merge: 59e52b3 ecac50e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 11 11:35:26 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jul 11 07:35:56 2017 -0400
Merge topic 'autogen_skip_included'
ecac50e1 Autogen: Skip included files on demand
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1039
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59e52b30416b3c1731ec56207baad2ef0295580b
commit 59e52b30416b3c1731ec56207baad2ef0295580b
Merge: 8d5ec21 c7d81e1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 11 11:35:08 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jul 11 07:35:27 2017 -0400
Merge topic 'doc_configure_file'
c7d81e16 Help: Explicitly state that some file generations are lazy
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1025
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efaf987ad1569d5329fc60f5e1f47f3e8809bb69
commit efaf987ad1569d5329fc60f5e1f47f3e8809bb69
Author: Iyyappa Murugandi <iyyappam at microsoft.com>
AuthorDate: Thu May 4 15:07:45 2017 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 7 14:04:20 2017 -0400
cmFileLockResult: Avoid allocation for Windows error message
diff --git a/Source/cmFileLockResult.cxx b/Source/cmFileLockResult.cxx
index a040705..9ca5d8a 100644
--- a/Source/cmFileLockResult.cxx
+++ b/Source/cmFileLockResult.cxx
@@ -5,6 +5,7 @@
#include <errno.h>
#include <string.h>
+#define WINMSG_BUF_LEN (1024)
cmFileLockResult cmFileLockResult::MakeOk()
{
return cmFileLockResult(OK, 0);
@@ -53,18 +54,12 @@ std::string cmFileLockResult::GetOutputMessage() const
case SYSTEM:
#if defined(_WIN32)
{
- char* errorText = NULL;
-
- // http://stackoverflow.com/a/455533/2288008
- DWORD flags = FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS;
- ::FormatMessageA(flags, NULL, this->ErrorValue,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPSTR)&errorText, 0, NULL);
-
- if (errorText != NULL) {
- const std::string message = errorText;
- ::LocalFree(errorText);
+ char winmsg[WINMSG_BUF_LEN];
+ DWORD flags = FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS;
+ if (FormatMessageA(flags, NULL, this->ErrorValue,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPSTR)winmsg, WINMSG_BUF_LEN, NULL)) {
+ const std::string message = winmsg;
return message;
} else {
return "Internal error (FormatMessageA failed)";
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7d81e16cb0f2023098ca64e33a4408b8ba80287
commit c7d81e16cb0f2023098ca64e33a4408b8ba80287
Author: Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Tue Jul 4 13:10:19 2017 +0200
Commit: Sylvain Joubert <joubert.sy at gmail.com>
CommitDate: Fri Jul 7 15:46:35 2017 +0200
Help: Explicitly state that some file generations are lazy
Fixes: #16856
diff --git a/Help/command/configure_file.rst b/Help/command/configure_file.rst
index 4304f09..6c60303 100644
--- a/Help/command/configure_file.rst
+++ b/Help/command/configure_file.rst
@@ -33,6 +33,8 @@ either ``#define VAR 1`` or ``#define VAR 0`` similarly.
If the input file is modified the build system will re-run CMake to
re-configure the file and generate the build system again.
+The generated file is modified and its timestamp updated on subsequent
+cmake runs only if its content is changed.
The arguments are:
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 7afb715..97466ff 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -306,8 +306,8 @@ from the input content to produce the output content. The options are:
Exactly one ``CONTENT`` or ``INPUT`` option must be given. A specific
``OUTPUT`` file may be named by at most one invocation of ``file(GENERATE)``.
-Generated files are modified on subsequent cmake runs only if their content
-is changed.
+Generated files are modified and their timestamp updated on subsequent cmake
+runs only if their content is changed.
Note also that ``file(GENERATE)`` does not create the output file until the
generation phase. The output file will not yet have been written when the
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b2bf5756bd01a955606f1963ad44bfde21f173f
commit 6b2bf5756bd01a955606f1963ad44bfde21f173f
Author: Rich Chiodo <rchiodo at microsoft.com>
AuthorDate: Thu Dec 15 12:22:14 2016 -0800
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 6 11:28:20 2017 -0400
FindMFC: Check for static MFC variant
Some CMake applications can set /MT without setting CMAKE_MFC_FLAG.
This change lets FindMFC work in those situations.
diff --git a/Modules/FindMFC.cmake b/Modules/FindMFC.cmake
index 5c2dbbf..3baaf32 100644
--- a/Modules/FindMFC.cmake
+++ b/Modules/FindMFC.cmake
@@ -31,6 +31,7 @@ if(MFC_ATTEMPT_TRY_COMPILE)
configure_file(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx)
message(STATUS "Looking for MFC")
+ # Try both shared and static as the root project may have set the /MT flag
try_compile(MFC_HAVE_MFC
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx
@@ -38,6 +39,16 @@ if(MFC_ATTEMPT_TRY_COMPILE)
-DCMAKE_MFC_FLAG:STRING=2
-DCOMPILE_DEFINITIONS:STRING=-D_AFXDLL
OUTPUT_VARIABLE OUTPUT)
+ if(NOT MFC_HAVE_MFC)
+ configure_file(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx)
+ try_compile(MFC_HAVE_MFC
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx
+ CMAKE_FLAGS
+ -DCMAKE_MFC_FLAG:STRING=1
+ OUTPUT_VARIABLE OUTPUT)
+ endif()
if(MFC_HAVE_MFC)
message(STATUS "Looking for MFC - found")
set(MFC_HAVE_MFC 1 CACHE INTERNAL "Have MFC?")
diff --git a/Tests/MFC/CMakeLists.txt.in b/Tests/MFC/CMakeLists.txt.in
index e6bfabd..bf98e91 100644
--- a/Tests/MFC/CMakeLists.txt.in
+++ b/Tests/MFC/CMakeLists.txt.in
@@ -45,6 +45,11 @@ set(files
set(CMAKE_MFC_FLAG "@CMAKE_MFC_FLAG_VALUE@")
+FIND_PACKAGE(MFC)
+IF (NOT MFC_FOUND)
+ MESSAGE(FATAL_ERROR "MFC Could not be found during the MFC test")
+ENDIF()
+
if("${CMAKE_MFC_FLAG}" STREQUAL "1")
msvc_link_to_static_crt()
else()
-----------------------------------------------------------------------
Summary of changes:
Help/command/configure_file.rst | 2 +
Help/command/file.rst | 4 +-
Help/generator/Visual Studio 15 2017.rst | 12 ++++++
Modules/FindMFC.cmake | 11 ++++++
Source/cmFileLockResult.cxx | 19 ++++------
Source/cmQtAutoGenerators.cxx | 61 ++++++++++++++++--------------
Source/cmVSSetupHelper.cxx | 28 ++++++++++++++
Tests/MFC/CMakeLists.txt.in | 5 +++
8 files changed, 100 insertions(+), 42 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list