Skip to content
Snippets Groups Projects
Commit cde85cb8 authored by calrama's avatar calrama
Browse files

Merge branch 'master' of github.com:BioroboticsLab/biotracker_backgroundsubtraction_tracker

parents c5bb7415 b37cbbf3
No related branches found
No related tags found
No related merge requests found
Pipeline #26445 passed
...@@ -43,13 +43,15 @@ set(CPACK_PACKAGE_VERSION ${SOURCE_VERSION}) ...@@ -43,13 +43,15 @@ set(CPACK_PACKAGE_VERSION ${SOURCE_VERSION})
if(PACKAGE_WINDOWS_MSI) if(PACKAGE_WINDOWS_MSI)
set(CPACK_GENERATOR "WIX") set(CPACK_GENERATOR "WIX")
set(CPACK_WIX_UPGRADE_GUID "f9c5c38a-76c3-49a6-ab41-ddfdde7a2c87") set(CPACK_WIX_UPGRADE_GUID "f9c5c38a-76c3-49a6-ab41-ddfdde7a2c87")
set(CPACK_WIX_PRODUCT_VERSION "0.0.0")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "BioTracker/BackgroundSubtraction_Tracker") set(CPACK_PACKAGE_INSTALL_DIRECTORY "BioTracker/BackgroundSubtraction_Tracker")
set(CPACK_WIX_PROGRAM_MENU_FOLDER "BioTracker") set(CPACK_WIX_PROGRAM_MENU_FOLDER "BioTracker")
set(CPACK_WIX_LICENSE_RTF ${CMAKE_SOURCE_DIR}/cmake/WIX/licence.rtf) set(CPACK_WIX_LICENSE_RTF ${CMAKE_SOURCE_DIR}/cmake/WIX/licence.rtf)
set(CPACK_WIX_TEMPLATE "${CMAKE_SOURCE_DIR}/cmake/WIX/WIX.template.in") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/WIX/WIX.template.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake/WIX/WIX.template")
set(CPACK_WIX_TEMPLATE "${CMAKE_CURRENT_BINARY_DIR}/cmake/WIX/WIX.template")
elseif(PACKAGE_TXZ) elseif(PACKAGE_TXZ)
set(CPACK_GENERATOR "TXZ") set(CPACK_GENERATOR "TXZ")
endif() endif()
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<Product Id="$(var.CPACK_WIX_PRODUCT_GUID)" <Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
Name="$(var.CPACK_PACKAGE_NAME)" Name="$(var.CPACK_PACKAGE_NAME)"
Language="1033" Language="1033"
Version="$(var.CPACK_PACKAGE_VERSION)" Version="@CPACK_WIX_PRODUCT_VERSION@"
Manufacturer="$(var.CPACK_PACKAGE_VENDOR)" Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)"> UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment