VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-22 17:45:48 -05:00
Code Issues Projects Releases Wiki Activity

Build: Windows: fixed bundling

Browse Source
This commit is contained in:
f4exb 2019-06-26 17:50:45 +02:00
parent 7559330482
commit f0f63ce59c
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -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)

4
cmake/cpack/CMakeLists.txt
View File

@ -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)