From 49d597db5d47ee108711e613700cab4f1e30b7ac Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 21 May 2015 10:12:53 +0200 Subject: [PATCH] STORM-2105: Correct specification of second macro parameter --- indra/cmake/WinManifest.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/cmake/WinManifest.cmake b/indra/cmake/WinManifest.cmake index 39f4def75d..89ffad636d 100644 --- a/indra/cmake/WinManifest.cmake +++ b/indra/cmake/WinManifest.cmake @@ -1,17 +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 +# Parameters - _target is the target file, resourceid specifies the resource identifier - MACRO(EMBED_MANIFEST _target type) + MACRO(EMBED_MANIFEST _target resourceid) ADD_CUSTOM_COMMAND( TARGET ${_target} POST_BUILD COMMAND "mt.exe" ARGS -manifest \"${CMAKE_SOURCE_DIR}\\tools\\manifests\\compatibility.manifest\" - -inputresource:\"$\"\;\#${type} - -outputresource:\"$\"\;\#${type} + -inputresource:\"$\"\;\#${resourceid} + -outputresource:\"$\"\;\#${resourceid} COMMENT "Adding compatibility manifest to ${_target}" ) - ENDMACRO(EMBED_MANIFEST _target type) + ENDMACRO(EMBED_MANIFEST _target resourceid)