Don't use new options by default (will break Server2008)

mariadb-corporation · Jun 4, 2016 · 15c66c2 · 15c66c2
1 parent 5cf10d8
commit 15c66c2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/cmake/sign.cmake b/cmake/sign.cmake
@@ -8,9 +8,14 @@
 MACRO(SIGN_TARGET target)
   IF(WITH_SIGNCODE)
     IF(WIN32)
-      SET(target_file $<TARGET_FILE:${target}>)
-      SET(SIGN_OPTIONS "/a /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /as")
-      ADD_CUSTOM_COMMAND(TARGET ${target} COMMAND signtool ARGS sign ${SIGN_OPTIONS} ${target_file})
+      IF(WITH_SIGNCODE STREQUAL 2)
+        SET(SIGN_OPTIONS "/a /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 ")
+      ENDIF()
+      IF(EXISTS "/tools/sign.bat")
+        ADD_CUSTOM_COMMAND(TARGET ${target} COMMAND /tools/sign.bat ARGS ${target_file})
+      ELSEIF()
+        ADD_CUSTOM_COMMAND(TARGET ${target} COMMAND signtool ARGS sign ${SIGN_OPTIONS} ${target_file})
+      ENDIF()
     ENDIF()
   ENDIF()
 ENDMACRO()