From 75e1437274fdc557008ee1fe19abbcb3a636a3e9 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Fri, 5 Apr 2019 14:55:23 -0700 Subject: [PATCH 1/2] Use optional environment variable for timestamp server URL --- CMakeLists.txt | 5 +++++ cmake/macros/OptionalWinExecutableSigning.cmake | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ba5e1264f..0fad5c10f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,11 @@ else() set(MOBILE 0) endif() +# Use default time server if none defined in environment +if (NOT DEFINED TIMESERVER_URL) + set(TIMESERVER_URL "http://sha256timestamp.ws.symantec.com/sha256/timestamp") +endif() + set(HIFI_USE_OPTIMIZED_IK OFF) set(BUILD_CLIENT_OPTION ON) set(BUILD_SERVER_OPTION ON) diff --git a/cmake/macros/OptionalWinExecutableSigning.cmake b/cmake/macros/OptionalWinExecutableSigning.cmake index 069fc12fc5..cbefdaea8f 100644 --- a/cmake/macros/OptionalWinExecutableSigning.cmake +++ b/cmake/macros/OptionalWinExecutableSigning.cmake @@ -22,7 +22,7 @@ macro(optional_win_executable_signing) # setup a post build command to sign the executable add_custom_command( TARGET ${TARGET_NAME} POST_BUILD - COMMAND ${SIGNTOOL_EXECUTABLE} sign /fd sha256 /f %HF_PFX_FILE% /p %HF_PFX_PASSPHRASE% /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 ${EXECUTABLE_PATH} + COMMAND ${SIGNTOOL_EXECUTABLE} sign /fd sha256 /f %HF_PFX_FILE% /p %HF_PFX_PASSPHRASE% /tr ${TIMESERVER_URL} /td SHA256 ${EXECUTABLE_PATH} ) else () message(FATAL_ERROR "HF_PFX_PASSPHRASE must be set for executables to be signed.") From 53ea50d1f345f68d860106dd19b12347e19fb20b Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Fri, 5 Apr 2019 15:45:11 -0700 Subject: [PATCH 2/2] Use set_from_env macro. --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fad5c10f1..551cfd2636 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,9 +53,7 @@ else() endif() # Use default time server if none defined in environment -if (NOT DEFINED TIMESERVER_URL) - set(TIMESERVER_URL "http://sha256timestamp.ws.symantec.com/sha256/timestamp") -endif() +set_from_env(TIMESERVER_URL TIMESERVER_URL "http://sha256timestamp.ws.symantec.com/sha256/timestamp") set(HIFI_USE_OPTIMIZED_IK OFF) set(BUILD_CLIENT_OPTION ON)