[Cmake-commits] CMake branch, master, updated. v3.10.2-982-ge2db853

[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  e2db8531f1ff1f0ea798023b58517f64a18c995a (commit)
       via  45f6aa3235691dbbcedae082c2513cdf13ec2fd1 (commit)
      from  4499cc8bb65e217e1cb2959452ed391af82e757b (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=e2db8531f1ff1f0ea798023b58517f64a18c995a
commit e2db8531f1ff1f0ea798023b58517f64a18c995a
Merge: 4499cc8 45f6aa3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 31 14:22:34 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jan 31 09:22:43 2018 -0500

    Merge topic 'windows-embed-cmake-gui-version'
    
    45f6aa32 Windows: Embed version information into cmake-gui
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1726


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45f6aa3235691dbbcedae082c2513cdf13ec2fd1
commit 45f6aa3235691dbbcedae082c2513cdf13ec2fd1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 30 11:51:03 2018 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 30 11:51:03 2018 -0500

    Windows: Embed version information into cmake-gui
    
    In commit 5b9da05b7a (Windows: Embed version information into CMake
    binaries, 2017-10-25) we accidentally left out cmake-gui.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 06d13ba..330b747 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -166,6 +166,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
 target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
 
+if(WIN32)
+  target_sources(cmake-gui PRIVATE $<TARGET_OBJECTS:CMakeVersion>)
+endif()
+
 # cmake-gui has not been updated for `include-what-you-use`.
 # Block the tool until this is done.
 set_target_properties(cmake-gui PROPERTIES

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

Summary of changes:
 Source/QtDialog/CMakeLists.txt |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake