Skip to content

Commit

Permalink
Do/release (#2601)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
dopitz committed Jul 4, 2023
1 parent 58ac8e3 commit 341ef8c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion common/cmake/package.cmake
Expand Up @@ -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(
Expand Down
6 changes: 4 additions & 2 deletions scripts/cmake-presets/package.json
Expand Up @@ -81,15 +81,17 @@
"hidden": true,
"inherits": ["package", "windows"],
"cacheVariables": {
"CMAKE_INSTALL_DATAROOTDIR": ""
"CMAKE_INSTALL_DATAROOTDIR": "",
"EMBREE_SIGN_FILE": "$env{SIGN_FILE_WINDOWS}"
}
},
{
"name": "package-static-windows",
"hidden": true,
"inherits": ["package-static", "windows"],
"cacheVariables": {
"CMAKE_INSTALL_DATAROOTDIR": ""
"CMAKE_INSTALL_DATAROOTDIR": "",
"EMBREE_SIGN_FILE": "$env{SIGN_FILE_WINDOWS}"
}
}
]
Expand Down

0 comments on commit 341ef8c

Please sign in to comment.