diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cdd0d7fb1686b14356d3f4b8f2f26e41a5cb3f2f..9a180981e9795449e06d965a90e74fd2cc0daa25 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 ee0ded1f79af6f6022d192bbc99b80e6d10f9d00..61609147d4b5d3ef6e687ebefc571320bb6c53dc 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)