From 341ef8c45d1ae072ead1ab65cd76e88b03d9302c Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 4 Jul 2023 11:17:39 +0200 Subject: [PATCH] Do/release (#2601) * fix release test package build * fix embree version for windows integration tests * fix cmake presets trailing comma * test fix for windows integration tests * embree docs run tests * update docs * added sign file back to windows packages --- common/cmake/package.cmake | 2 +- scripts/cmake-presets/package.json | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake index b5f68961a1..0743c0dcd0 100644 --- a/common/cmake/package.cmake +++ b/common/cmake/package.cmake @@ -300,7 +300,7 @@ IF(WIN32) ENDIF() add_custom_target( - post_package "${PROJECT_SOURCE_DIR}/scripts/package_post_build_win.bat" "${PACKAGE_BASE_NAME}" + post_package "${PROJECT_SOURCE_DIR}/scripts/package_post_build_win.bat" "${PACKAGE_BASE_NAME}" "${EMBREE_SIGN_FILE}" ) add_custom_target( diff --git a/scripts/cmake-presets/package.json b/scripts/cmake-presets/package.json index c277119839..0e7cf16682 100644 --- a/scripts/cmake-presets/package.json +++ b/scripts/cmake-presets/package.json @@ -81,7 +81,8 @@ "hidden": true, "inherits": ["package", "windows"], "cacheVariables": { - "CMAKE_INSTALL_DATAROOTDIR": "" + "CMAKE_INSTALL_DATAROOTDIR": "", + "EMBREE_SIGN_FILE": "$env{SIGN_FILE_WINDOWS}" } }, { @@ -89,7 +90,8 @@ "hidden": true, "inherits": ["package-static", "windows"], "cacheVariables": { - "CMAKE_INSTALL_DATAROOTDIR": "" + "CMAKE_INSTALL_DATAROOTDIR": "", + "EMBREE_SIGN_FILE": "$env{SIGN_FILE_WINDOWS}" } } ]