[Cmake-commits] CMake branch, master, updated. v3.10.0-480-g006a495

[Kitware Robot]

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  006a4956a296ed5a9c01fbd5c242c240dc3aac99 (commit)
       via  4a3c19a5835de0049cdb2acea7be8ffeaff08aba (commit)
      from  4d0bcc94c4b965dc08f826d2242248fa3db885b7 (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=006a4956a296ed5a9c01fbd5c242c240dc3aac99
commit 006a4956a296ed5a9c01fbd5c242c240dc3aac99
Merge: 4d0bcc9 4a3c19a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 1 13:11:01 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Dec 1 08:11:07 2017 -0500

    Merge topic 'fixCMakeVersionRC'
    
    4a3c19a5 Windows: Fix version embedding in CMake binaries
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1536


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a3c19a5835de0049cdb2acea7be8ffeaff08aba
commit 4a3c19a5835de0049cdb2acea7be8ffeaff08aba
Author:     Justin Goshi <jgoshi at microsoft.com>
AuthorDate: Wed Nov 29 12:48:26 2017 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 30 10:42:26 2017 -0500

    Windows: Fix version embedding in CMake binaries
    
    In commit 5b9da05b7a (Windows: Embed version information into CMake
    binaries, 2017-10-25) we left out `<winres.h>` since MinGW does not have
    the header, but it is needed for the `VS_VERSION_INFO` macro.  Provide
    the macro ourselves.
    
    Suggested-by: Christian Pfeiffer <cpfeiffer at live.de>

diff --git a/Source/CMakeVersion.rc.in b/Source/CMakeVersion.rc.in
index f4ca3d5..60e14e5 100644
--- a/Source/CMakeVersion.rc.in
+++ b/Source/CMakeVersion.rc.in
@@ -7,6 +7,9 @@
 #define VER_PRODUCTVERSION          @CMake_VERSION_MAJOR@, at CMake_VERSION_MINOR@, at CMake_VERSION_PATCH@
 #define VER_PRODUCTVERSION_STR      "@CMake_VERSION@\0"
 
+/* Version-information resource identifier.  */
+#define VS_VERSION_INFO 1
+
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION    	VER_FILEVERSION
 PRODUCTVERSION 	VER_PRODUCTVERSION

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.rc.in |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake