This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via b498967243cb531c8c6fe60e6712432a2064507b (commit)
via 9af34615ae1a84a890a280c3cdd75856e879fb64 (commit)
via 9a34031081ccd0a3a782d756d6e24be6fdc1740c (commit)
via 29f4f70b41858b8d89a4cf77a8f87ceb1df3b80a (commit)
via 1069a3f02bbe12fdf326cf7cfdb12820cee6030a (commit)
via 9a324cbee092276b4c344b5deec5875ab76b3e3b (commit)
from a8f1527ba46b31c5583999391c05421eb86f4973 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b498967243cb531c8c6fe60e6712432a2064507b
commit b498967243cb531c8c6fe60e6712432a2064507b
Merge: 9af3461 9a324cb
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon May 13 14:02:17 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon May 13 10:02:26 2019 -0400
Merge topic 'FindProtobuf-gen-sources'
9a324cbee0 Protobuf: Fix generated source path with
PROTOBUF_GENERATE_CPP_APPEND_PATH OFF
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3295
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9af34615ae1a84a890a280c3cdd75856e879fb64
commit 9af34615ae1a84a890a280c3cdd75856e879fb64
Merge: a8f1527 9a34031
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon May 13 13:57:33 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon May 13 09:57:43 2019 -0400
Merge topic 'windows-signing'
9a34031081 Utilities/Release: Enable signing of Windows release binaries
29f4f70b41 Add undocumented option to sign CMake's own binaries on Windows
1069a3f02b Configure CMake itself with policies through CMake 3.14
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3296
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a34031081ccd0a3a782d756d6e24be6fdc1740c
commit 9a34031081ccd0a3a782d756d6e24be6fdc1740c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 7 15:03:16 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed May 8 13:18:31 2019 -0400
Utilities/Release: Enable signing of Windows release binaries
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)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29f4f70b41858b8d89a4cf77a8f87ceb1df3b80a
commit 29f4f70b41858b8d89a4cf77a8f87ceb1df3b80a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 7 15:02:20 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed May 8 13:18:31 2019 -0400
Add undocumented option to sign CMake's own binaries on Windows
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9274a8a..51a1d8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -822,4 +822,10 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
# Install auxiliary files integrating with other tools.
add_subdirectory(Auxiliary)
+
+ # Optionally sign installed binaries.
+ if(CMake_INSTALL_SIGNTOOL)
+ configure_file(Source/CMakeInstallSignTool.cmake.in
Source/CMakeInstallSignTool.cmake @ONLY)
+ install(SCRIPT
${CMAKE_CURRENT_BINARY_DIR}/Source/CMakeInstallSignTool.cmake)
+ endif()
endif()
diff --git a/Source/CMakeInstallSignTool.cmake.in
b/Source/CMakeInstallSignTool.cmake.in
new file mode 100644
index 0000000..fca629c
--- /dev/null
+++ b/Source/CMakeInstallSignTool.cmake.in
@@ -0,0 +1,51 @@
+# The signtool. Default to PATH.
+set(CMake_INSTALL_SIGNTOOL "@CMake_INSTALL_SIGNTOOL@")
+if(NOT CMake_INSTALL_SIGNTOOL)
+ set(CMake_INSTALL_SIGNTOOL signtool)
+endif()
+
+# Select a certificate by Subject Name. Default to automatic selection.
+set(CMake_INSTALL_SIGNTOOL_SUBJECT_NAME
"@CMake_INSTALL_SIGNTOOL_SUBJECT_NAME@")
+if(CMake_INSTALL_SIGNTOOL_SUBJECT_NAME)
+ set(select_cert -n "${CMake_INSTALL_SIGNTOOL_SUBJECT_NAME}")
+else()
+ set(select_cert -a)
+endif()
+
+# Timestamp URL. Default to a common provider.
+set(CMake_INSTALL_SIGNTOOL_TIMESTAMP_URL
"@CMake_INSTALL_SIGNTOOL_TIMESTAMP_URL@")
+if(NOT CMake_INSTALL_SIGNTOOL_TIMESTAMP_URL)
+ set(CMake_INSTALL_SIGNTOOL_TIMESTAMP_URL "http://timestamp.digicert.com";)
+endif()
+
+# Glob files that need a signature.
+file(GLOB files "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/*.exe")
+
+# Sign all files at once.
+if(files)
+ # Run the signtool through 'cmd /c' to enable password prompt popup.
+ # Some providers have trouble when signtool is invoked with SW_HIDE.
+ set(cmd cmd /c "${CMake_INSTALL_SIGNTOOL}" sign -v ${select_cert})
+
+ # Sign with SHA-1 for Windows 7 and below.
+ execute_process(
+ COMMAND ${cmd} -t "${CMake_INSTALL_SIGNTOOL_TIMESTAMP_URL}" ${files}
+ RESULT_VARIABLE result
+ ERROR_VARIABLE stderr
+ )
+ if(NOT result EQUAL 0)
+ string(REPLACE "\n" "\n " stderr " ${stderr}")
+ message(WARNING "signtool failed:\n${stderr}")
+ endif()
+
+ # Sign with SHA-256 for Windows 8 and above.
+ execute_process(
+ COMMAND ${cmd} -tr "${CMake_INSTALL_SIGNTOOL_TIMESTAMP_URL}" -fd sha256
-td sha256 -as ${files}
+ RESULT_VARIABLE result
+ ERROR_VARIABLE stderr
+ )
+ if(NOT result EQUAL 0)
+ string(REPLACE "\n" "\n " stderr " ${stderr}")
+ message(WARNING "signtool failed:\n${stderr}")
+ endif()
+endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1069a3f02bbe12fdf326cf7cfdb12820cee6030a
commit 1069a3f02bbe12fdf326cf7cfdb12820cee6030a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 7 13:11:36 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed May 8 13:18:30 2019 -0400
Configure CMake itself with policies through CMake 3.14
In particular, set `CMP0082` to `NEW` to interleave install commands
in the top-level directory with subdirectory installations.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc033ba..9274a8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
-cmake_minimum_required(VERSION 3.1...3.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1...3.14 FATAL_ERROR)
set(CMAKE_USER_MAKE_RULES_OVERRIDE_C
${CMAKE_CURRENT_SOURCE_DIR}/Source/Modules/OverrideC.cmake)
set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
${CMAKE_CURRENT_SOURCE_DIR}/Source/Modules/OverrideCXX.cmake)
project(CMake)
diff --git a/Utilities/Doxygen/CMakeLists.txt b/Utilities/Doxygen/CMakeLists.txt
index 2cdd767..ce4cfaf 100644
--- a/Utilities/Doxygen/CMakeLists.txt
+++ b/Utilities/Doxygen/CMakeLists.txt
@@ -3,7 +3,7 @@
if(NOT CMake_SOURCE_DIR)
set(CMakeDeveloperReference_STANDALONE 1)
- cmake_minimum_required(VERSION 3.1...3.12 FATAL_ERROR)
+ cmake_minimum_required(VERSION 3.1...3.14 FATAL_ERROR)
get_filename_component(tmp "${CMAKE_CURRENT_SOURCE_DIR}" PATH)
get_filename_component(CMake_SOURCE_DIR "${tmp}" PATH)
include(${CMake_SOURCE_DIR}/Modules/CTestUseLaunchers.cmake)
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index 15204d6..c5b2bfe 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -3,7 +3,7 @@
if(NOT CMake_SOURCE_DIR)
set(CMakeHelp_STANDALONE 1)
- cmake_minimum_required(VERSION 3.1...3.12 FATAL_ERROR)
+ cmake_minimum_required(VERSION 3.1...3.14 FATAL_ERROR)
get_filename_component(tmp "${CMAKE_CURRENT_SOURCE_DIR}" PATH)
get_filename_component(CMake_SOURCE_DIR "${tmp}" PATH)
include(${CMake_SOURCE_DIR}/Modules/CTestUseLaunchers.cmake)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a324cbee092276b4c344b5deec5875ab76b3e3b
commit 9a324cbee092276b4c344b5deec5875ab76b3e3b
Author: Bob Weinand <bobw...@hotmail.com>
AuthorDate: Wed May 8 12:54:37 2019 +0200
Commit: Bob Weinand <bobw...@hotmail.com>
CommitDate: Wed May 8 14:57:00 2019 +0200
Protobuf: Fix generated source path with PROTOBUF_GENERATE_CPP_APPEND_PATH
OFF
diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 1758fb3..76bc873 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -207,9 +207,14 @@ function(protobuf_generate)
get_filename_component(_basename ${_proto} NAME_WE)
file(RELATIVE_PATH _rel_dir ${CMAKE_CURRENT_SOURCE_DIR} ${_abs_dir})
+ set(_possible_rel_dir)
+ if (NOT protobuf_generate_APPEND_PATH)
+ set(_possible_rel_dir ${_rel_dir}/)
+ endif()
+
set(_generated_srcs)
foreach(_ext ${protobuf_generate_GENERATE_EXTENSIONS})
- list(APPEND _generated_srcs
"${protobuf_generate_PROTOC_OUT_DIR}/${_basename}${_ext}")
+ list(APPEND _generated_srcs
"${protobuf_generate_PROTOC_OUT_DIR}/${_possible_rel_dir}${_basename}${_ext}")
endforeach()
if(protobuf_generate_DESCRIPTORS AND protobuf_generate_LANGUAGE STREQUAL
cpp)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 8 +++++-
Modules/FindProtobuf.cmake | 7 ++++-
Source/CMakeInstallSignTool.cmake.in | 51 +++++++++++++++++++++++++++++++++
Utilities/Doxygen/CMakeLists.txt | 2 +-
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 +++
Utilities/Sphinx/CMakeLists.txt | 2 +-
10 files changed, 77 insertions(+), 5 deletions(-)
create mode 100644 Source/CMakeInstallSignTool.cmake.in
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
