[Cmake-commits] CMake branch, next, updated. v3.3.2-3141-g95d21a8

[Brad King]

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  95d21a818a0531e148c527c0c64d176c812e718e (commit)
       via  98908b0f3ed997294d4ab40b04d191cf278d658e (commit)
      from  281ecf26db4308e41de0eaa3707d216e1806b5a4 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95d21a818a0531e148c527c0c64d176c812e718e
commit 95d21a818a0531e148c527c0c64d176c812e718e
Merge: 281ecf2 98908b0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 21 09:02:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 21 09:02:30 2015 -0400

    Merge topic 'fix-windows-version-detection' into next
    
    98908b0f fixup! Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8 (#15674)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98908b0f3ed997294d4ab40b04d191cf278d658e
commit 98908b0f3ed997294d4ab40b04d191cf278d658e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 21 09:02:14 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 21 09:02:14 2015 -0400

    fixup! Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8 (#15674)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 7a671be..e2a7ff2 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -505,7 +505,7 @@ if (WIN32)
 
     # Add a manifest file to executables on Windows to allow for
     # GetVersion to work properly on Windows 8 and above.
-    set(MANIFEST_FILE cmake.version.manifest)
+    set(MANIFEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake.version.manifest)
   endif()
 endif ()
 

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

Summary of changes:
 Source/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake