Windows|CMake: Sign the deployed executables and libraries

Use the correct installation components so CPack will find the right files when signing.
skyjake · Mar 21, 2016 · b98d750 · b98d750
1 parent 702cba9
commit b98d750
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/doomsday/cmake/Macros.cmake b/doomsday/cmake/Macros.cmake
@@ -419,7 +419,7 @@ macro (deng_deploy_library target name)
     endif ()
     if (WIN32 AND DENG_SIGNTOOL_CERT)
         get_property (_outName TARGET ${target} PROPERTY OUTPUT_NAME)
-        deng_signtool (bin/${_outName}.dll)
+        deng_signtool (bin/${_outName}.dll libs)
     endif ()
 endmacro (deng_deploy_library)
 
@@ -449,7 +449,7 @@ macro (deng_codesign target)
     endif ()
     if (WIN32 AND DENG_SIGNTOOL_CERT)
         get_property (_outName TARGET ${target} PROPERTY OUTPUT_NAME)
-        deng_signtool (bin/${_outName}.exe)
+        deng_signtool (bin/${_outName}.exe "")
     endif ()
 endmacro ()
 
@@ -707,7 +707,7 @@ function (deng_install_tool target)
             if (NOT _outName)
                 set (_outName ${target})
             endif ()
-            deng_signtool (bin/${_outName}.exe)
+            deng_signtool (bin/${_outName}.exe ${comp})
         endif ()
     endif ()
 endfunction (deng_install_tool)

diff --git a/doomsday/cmake/PlatformWindows.cmake b/doomsday/cmake/PlatformWindows.cmake
@@ -20,14 +20,15 @@ set (DENG_SIGNTOOL_PASSPHRASE "" CACHE STRING "Signing certificate passphrase.")
 find_program (SIGNTOOL_COMMAND signtool)
 mark_as_advanced (SIGNTOOL_COMMAND)
 
-function (deng_signtool path)
+function (deng_signtool path comp)
     install (CODE "message (STATUS \"Signing ${path}...\")
         execute_process (COMMAND \"${SIGNTOOL_COMMAND}\" sign
             /f \"${DENG_SIGNTOOL_CERT}\"
             /p ${DENG_SIGNTOOL_PASSPHRASE}
             /t http://timestamp.verisign.com/scripts/timstamp.dll
             \"\${CMAKE_INSTALL_PREFIX}/${path}\"
         )"
+        COMPONENT ${comp}
     )
 endfunction ()