From cc6da6d68e89cb1866f8a982da0075e54ce9e4d8 Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner <mm@ucw.sh> Date: Fri, 13 Mar 2020 16:31:45 +0100 Subject: [PATCH] PACKAGE_WINDOWS_MSI -> PACKAGE_MSI --- .gitlab-ci.py | 2 +- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.py b/.gitlab-ci.py index acc5f3f..140a2f7 100755 --- a/.gitlab-ci.py +++ b/.gitlab-ci.py @@ -88,7 +88,7 @@ def build(args): 'CMAKE_TOOLCHAIN_FILE', env['VCPKG_DIR'] + '/scripts/buildsystems/vcpkg.cmake') command += define('VCPKG_TARGET_TRIPLET', env['VCPKG_TRIPLET']) - command += define('PACKAGE_WINDOWS_MSI', 'ON') + command += define('PACKAGE_MSI', 'ON') elif system() == 'Linux': command += define('PACKAGE_TXZ', 'ON') check_call(command) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46dabbd..5ceaf9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(biotracker-background_subtraction_tracker ) if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") - option(PACKAGE_WINDOWS_MSI "Create .msi package" OFF) + option(PACKAGE_MSI "Create MSI package" OFF) endif() option(PACKAGE_TXZ "Create .tar.xz package" OFF) @@ -40,7 +40,7 @@ set(CPACK_PACKAGE_NAME "BioTracker-Tracker-BackgroundSubtraction") set(CPACK_PACKAGE_VENDOR "Biorobotics Lab / FU Berlin") set(CPACK_PACKAGE_VERSION ${SOURCE_VERSION}) -if(PACKAGE_WINDOWS_MSI) +if(PACKAGE_MSI) set(CPACK_GENERATOR "WIX") set(CPACK_WIX_UPGRADE_GUID "f9c5c38a-76c3-49a6-ab41-ddfdde7a2c87") set(CPACK_WIX_PRODUCT_VERSION "0.0.0") -- GitLab