From e4d2100d86fe7e722fa821031f9229a86766e185 Mon Sep 17 00:00:00 2001
From: Hauke Moenck <hauke_moenck@gmx.de>
Date: Thu, 25 Oct 2018 11:31:07 +0200
Subject: [PATCH] removed msi installer. Tedious for too less gain
---
.gitlab-ci.yml | 2 +-
CMakeLists.txt | 15 +--------------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdd0d7f..9a18098 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,7 @@ build ubuntu-18.04:
build windows:
<<: *build_windows
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
.package: &package
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee0ded1..6160914 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,19 +81,6 @@ set(CPACK_PACKAGE_NAME "RoboFish Behavior Loader")
set(CPACK_PACKAGE_VENDOR "Biorobotics Lab / FU Berlin")
set(CPACK_PACKAGE_VERSION ${GIT_TAG})
-
-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()
+set(CPACK_GENERATOR "TXZ")
include(CPack)
--
GitLab