[Cmake-commits] CMake branch, next, updated. v3.3.2-3095-g5f52553

[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  5f52553b93ab3e1eda049d91d6317af0df18dc5a (commit)
       via  cdd155511105c4d58a261f52cf5b06dd91f3a31b (commit)
      from  1ed2b02276428ade4664e755ae53ebaae6383c7a (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=5f52553b93ab3e1eda049d91d6317af0df18dc5a
commit 5f52553b93ab3e1eda049d91d6317af0df18dc5a
Merge: 1ed2b02 cdd1555
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 18 14:19:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 18 14:19:18 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdd155511105c4d58a261f52cf5b06dd91f3a31b
commit cdd155511105c4d58a261f52cf5b06dd91f3a31b
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Sep 18 10:23:21 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 18 14:16:21 2015 -0400

    Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8 (#15674)
    
    According to GetVersionEx documentation:
    
     https://msdn.microsoft.com/en-us/library/windows/desktop/ms724451.aspx
     https://msdn.microsoft.com/en-us/library/windows/desktop/dn481241.aspx
    
    we must manifest each application to explicitly declare support for each
    version of Windows.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 16b9ea1..7a671be 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -502,6 +502,10 @@ if (WIN32)
       cmGhsMultiGpj.cxx
       cmGhsMultiGpj.h
       )
+
+    # 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)
   endif()
 endif ()
 
@@ -531,7 +535,7 @@ set(SRCS ${SRCS}
 
 if(WIN32 AND NOT CYGWIN)
   set_source_files_properties(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS _WIN32_WINNT=0x0501)
-  add_executable(cmcldeps cmcldeps.cxx)
+  add_executable(cmcldeps cmcldeps.cxx ${MANIFEST_FILE})
   target_link_libraries(cmcldeps CMakeLib)
   install(TARGETS cmcldeps DESTINATION bin)
 endif()
@@ -720,15 +724,15 @@ if(APPLE)
 endif()
 
 # Build CMake executable
-add_executable(cmake cmakemain.cxx cmcmd.cxx cmcmd.h)
+add_executable(cmake cmakemain.cxx cmcmd.cxx cmcmd.h ${MANIFEST_FILE})
 target_link_libraries(cmake CMakeLib)
 
 # Build CTest executable
-add_executable(ctest ctest.cxx)
+add_executable(ctest ctest.cxx ${MANIFEST_FILE})
 target_link_libraries(ctest CTestLib)
 
 # Build CPack executable
-add_executable(cpack CPack/cpack.cxx)
+add_executable(cpack CPack/cpack.cxx ${MANIFEST_FILE})
 target_link_libraries(cpack CPackLib)
 
 # Curses GUI
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 570b537..66fd18b 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -152,7 +152,7 @@ endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
+add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
 target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
 
 if(APPLE)
diff --git a/Source/cmake.version.manifest b/Source/cmake.version.manifest
new file mode 100644
index 0000000..e7010c9
--- /dev/null
+++ b/Source/cmake.version.manifest
@@ -0,0 +1,18 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0"
+		  xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
+   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+       <application>
+           <!-- Windows Vista -->
+           <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+           <!-- Windows 7 -->
+           <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+           <!-- Windows 8 -->
+           <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+           <!-- Windows 8.1 -->
+           <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+           <!-- Windows 10 -->
+           <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+       </application>
+   </compatibility>
+</assembly>

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

Summary of changes:
 Source/CMakeLists.txt          |   12 ++++++++----
 Source/QtDialog/CMakeLists.txt |    2 +-
 Source/cmake.version.manifest  |   18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 Source/cmake.version.manifest


hooks/post-receive
-- 
CMake