From 9a34031081ccd0a3a782d756d6e24be6fdc1740c Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 7 May 2019 15:03:16 -0400 Subject: Utilities/Release: Enable signing of Windows release binaries --- Utilities/Release/linux64_release.cmake | 1 + Utilities/Release/osx_release.cmake | 1 + Utilities/Release/release_cmake.sh.in | 2 +- Utilities/Release/win32_release.cmake | 4 ++++ Utilities/Release/win64_release.cmake | 4 ++++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake index fa585d7..958ed25 100644 --- a/Utilities/Release/linux64_release.cmake +++ b/Utilities/Release/linux64_release.cmake @@ -44,6 +44,7 @@ CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES:STRING=${qt_xcb_libs} set(ENV [[ export CMAKE_PREFIX_PATH=/opt/binutils-2.31 ]]) +set(SIGN "") # Exclude Qt5 tests because our Qt5 is static. set(EXTRA_CTEST_ARGS "-E Qt5") diff --git a/Utilities/Release/osx_release.cmake b/Utilities/Release/osx_release.cmake index be11d47..ac35872 100644 --- a/Utilities/Release/osx_release.cmake +++ b/Utilities/Release/osx_release.cmake @@ -29,5 +29,6 @@ CMake_TEST_NO_FindPackageModeMakefileTest:BOOL=TRUE set(ENV [[ export CMAKE_PREFIX_PATH='/Users/kitware/SDKs/qt-5.6.2-clang-x64' ]]) +set(SIGN "") get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in index f363b3d..696a3f4 100755 --- a/Utilities/Release/release_cmake.sh.in +++ b/Utilities/Release/release_cmake.sh.in @@ -150,7 +150,7 @@ for GEN in $generators; do check_exit_value $? "Create $GEN package" || exit 1 done - +@SIGN@ echo "End release" date diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake index 974c402..468e5f4 100644 --- a/Utilities/Release/win32_release.cmake +++ b/Utilities/Release/win32_release.cmake @@ -45,5 +45,9 @@ set(GIT_EXTRA "git config core.autocrlf true") if(CMAKE_CREATE_VERSION STREQUAL "nightly") # Some tests fail spuriously too often. set(EXTRA_CTEST_ARGS "-E 'ConsoleBuf|Module.ExternalData'") + set(SIGN "") +else() + string(APPEND INITIAL_CACHE "CMake_INSTALL_SIGNTOOL:STRING=signtool\n") + set(SIGN [[signtool sign -v -a -tr http://timestamp.digicert.com -fd sha256 -td sha256 -d "CMake Windows Installer" cmake-*.msi]]) endif() include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake index 20529f0..5a93ce6 100644 --- a/Utilities/Release/win64_release.cmake +++ b/Utilities/Release/win64_release.cmake @@ -45,5 +45,9 @@ set(GIT_EXTRA "git config core.autocrlf true") if(CMAKE_CREATE_VERSION STREQUAL "nightly") # Some tests fail spuriously too often. set(EXTRA_CTEST_ARGS "-E 'ConsoleBuf|Module.ExternalData'") + set(SIGN "") +else() + string(APPEND INITIAL_CACHE "CMake_INSTALL_SIGNTOOL:STRING=signtool\n") + set(SIGN [[signtool sign -v -a -tr http://timestamp.digicert.com -fd sha256 -td sha256 -d "CMake Windows Installer" cmake-*.msi]]) endif() include(${path}/release_cmake.cmake) -- cgit v0.12