Skip to content
Snippets Groups Projects
Commit e4d2100d authored by moenck's avatar moenck
Browse files

removed msi installer. Tedious for too less gain

parent c8b217d3
No related branches found
No related tags found
No related merge requests found
Pipeline #12432 passed
...@@ -54,7 +54,7 @@ build ubuntu-18.04: ...@@ -54,7 +54,7 @@ build ubuntu-18.04:
build windows: build windows:
<<: *build_windows <<: *build_windows
script: script:
- cmake -Bbuild "-H." -DCMAKE_BUILD_TYPE=Release -G Ninja -DPACKAGE_WINDOWS_MSI=ON -DINSTALL_REQUIRED_SYSTEM_LIBRARIES=ON -DINSTALL_SHARED_LIBRARIES='flang;flangrti;libomp;zlib1' -DINSTALL_OPENCV_COMPONENTS='core' -DCMAKE_PREFIX_PATH="$env:CMAKE_PREFIX_PATH" -DCPACK_PACKAGE_DIRECTORY="$env:PACKAGE_DIR" -DCMAKE_SUPPRESS_REGENERATION=ON -DCMAKE_SKIP_PACKAGE_ALL_DEPENDENCY=ON - cmake -Bbuild "-H." -DCMAKE_BUILD_TYPE=Release -G Ninja -DCMAKE_PREFIX_PATH="$env:CMAKE_PREFIX_PATH" -DCPACK_PACKAGE_DIRECTORY="$env:PACKAGE_DIR"
- ninja -C build - ninja -C build
.package: &package .package: &package
......
...@@ -81,19 +81,6 @@ set(CPACK_PACKAGE_NAME "RoboFish Behavior Loader") ...@@ -81,19 +81,6 @@ set(CPACK_PACKAGE_NAME "RoboFish Behavior Loader")
set(CPACK_PACKAGE_VENDOR "Biorobotics Lab / FU Berlin") set(CPACK_PACKAGE_VENDOR "Biorobotics Lab / FU Berlin")
set(CPACK_PACKAGE_VERSION ${GIT_TAG}) set(CPACK_PACKAGE_VERSION ${GIT_TAG})
set(CPACK_GENERATOR "TXZ")
if(PACKAGE_WINDOWS_MSI)
set(CPACK_GENERATOR "WIX")
set(CPACK_WIX_UPGRADE_GUID "1c78d2f3-5d5c-470a-8857-cefb34a9e4fa")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "RoboFish/Libraries")
set(CPACK_WIX_PROGRAM_MENU_FOLDER "RoboFish")
set(CPACK_WIX_LICENSE_RTF ${CMAKE_SOURCE_DIR}/cmake/WIX/licence.rtf)
set(CPACK_WIX_TEMPLATE "${CMAKE_SOURCE_DIR}/cmake/WIX/WIX.template.in")
elseif(PACKAGE_TXZ)
set(CPACK_GENERATOR "TXZ")
endif()
include(CPack) include(CPack)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment