From f0f63ce59c1594143fa927367d25057570554798 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 26 Jun 2019 17:50:45 +0200
Subject: [PATCH] Build: Windows: fixed bundling

---
 CMakeLists.txt             | 8 ++------
 cmake/cpack/CMakeLists.txt | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 661297835..6620a2081 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,12 +45,9 @@ option(ENABLE_XTRX "Enable XTRX support" ON)
 option(ENABLE_PACK_MIRSDRAPI "Enable inclusion of the mirsdr-api library - for personal use only" OFF)
 # on windows always build external libraries
 if(WIN32)
-  option(ENABLE_EXTERNAL_LIBRARIES "Build external libraries" ON)
+  set(ENABLE_EXTERNAL_LIBRARIES ON CACHE BOOL "Build external libraries" FORCE)
   # to run fixup_bundle()
-  option(BUNDLE "Enable distribution bundle" ON)
-else()
-  option(ENABLE_EXTERNAL_LIBRARIES "Build external libraries" OFF)
-  option(BUNDLE "Enable distribution bundle" OFF)
+  set(BUNDLE ON CACHE BOOL "Enable distribution bundle" FORCE)
 endif()
 
 # Set additional project information
@@ -186,7 +183,6 @@ elseif(APPLE)
   configure_file("${CMAKE_SOURCE_DIR}/cmake/cpack/MacOSXBundleInfo.plist.in"
     "${CMAKE_BINARY_DIR}/Info.plist" @ONLY)
 elseif (WIN32)
-  # check compiler version
   # check compiler version
   if(MSVC_VERSION GREATER 1910 AND MSVC_VERSION LESS 1919)
     set(VS2017 ON)
diff --git a/cmake/cpack/CMakeLists.txt b/cmake/cpack/CMakeLists.txt
index 14a54c82a..1a8f3cf3c 100644
--- a/cmake/cpack/CMakeLists.txt
+++ b/cmake/cpack/CMakeLists.txt
@@ -302,9 +302,9 @@ elseif(WIN32 OR MINGW)
       "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\SDRangel.lnk' '$INSTDIR\\\\sdrangel.exe'")
     set(CPACK_NSIS_DELETE_ICONS_EXTRA
       "Delete '$SMPROGRAMS\\\\$START_MENU\\\\SDRangel.lnk'")
-  endif()
+  endif(BUNDLE)
 
-endif(APPLE AND BUNDLE AND BUILD_GUI)
+endif(WIN32 OR MINGW)
 
 message(STATUS "CPack generators: ${CPACK_GENERATOR}")
 include(CPack)