Manifest for windows 10

indra/cmake/00-Common.cmake

@@ -90,11 +90,6 @@ if (WINDOWS)
   # configure win32 API for windows Vista+ compatibility
   set(WINVER "0x0600" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
   add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
-
-  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
-  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO")
-  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
-
 endif (WINDOWS)
 
 set (GCC_EXTRA_OPTIMIZATIONS "-ffast-math")

indra/cmake/CMakeLists.txt

@@ -98,6 +98,7 @@ set(cmake_SOURCE_FILES
     UnixInstall.cmake
     Variables.cmake
     ViewerMiscLibs.cmake
+    WinManifest.cmake
     XmlRpcEpi.cmake
     ZLIB.cmake
     )

indra/cmake/WinManifest.cmake

@@ -0,0 +1,17 @@
+# - Embeds a specific manifest file in a Windows binary
+# Defines the following:
+# EMBED_MANIFEST - embed manifest in a windows binary with mt
+# Parameters - _target is the target file, type - 1 for EXE, 2 for DLL
+
+  MACRO(EMBED_MANIFEST _target type)
+    ADD_CUSTOM_COMMAND(
+      TARGET ${_target}
+      POST_BUILD
+      COMMAND "mt.exe"
+      ARGS
+        -manifest \"${CMAKE_SOURCE_DIR}\\tools\\manifests\\compatibility.manifest\"
+        -inputresource:\"$<TARGET_FILE:${_target}>\"\;\#${type}
+        -outputresource:\"$<TARGET_FILE:${_target}>\"\;\#${type}
+      COMMENT "Adding compatibility manifest to ${_target}"
+    )
+  ENDMACRO(EMBED_MANIFEST _target type)

indra/llplugin/slplugin/CMakeLists.txt

@@ -6,6 +6,7 @@ include(LLPlugin)
 include(Linking)
 include(PluginAPI)
 include(LLMessage)
+include(WinManifest)
 
 include_directories(
     ${LLPLUGIN_INCLUDE_DIRS}
@@ -58,6 +59,7 @@ if (WINDOWS)
     PROPERTIES
     LINK_FLAGS "/OPT:NOREF"
   )
+  EMBED_MANIFEST(SLPlugin 1)
 endif()
 
 target_link_libraries(SLPlugin

indra/newview/CMakeLists.txt

@@ -40,6 +40,7 @@ include(StateMachine)
 include(TemplateCheck)
 include(UI)
 include(ViewerMiscLibs)
+include(WinManifest)
 
 
 if (WINDOWS)
@@ -1558,6 +1559,9 @@ if (WINDOWS)
     add_dependencies(${VIEWER_BINARY_NAME}
       SLPlugin
       )
+
+    EMBED_MANIFEST(${VIEWER_BINARY_NAME} 1)
+
     # sets the 'working directory' for debugging from visual studio.
     if (NOT UNATTENDED)
         add_custom_command(

indra/tools/manifests/compatibility.manifest

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> 
+    <application> 
+      <!-- Windows 10 --> 
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> 
+    </application> 
+  </compatibility>
+</assembly>