kopia lustrzana https://github.com/f4exb/sdrangel
Build: Windows: fixed bundling
rodzic
7559330482
commit
f0f63ce59c
|
@ -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)
|
option(ENABLE_PACK_MIRSDRAPI "Enable inclusion of the mirsdr-api library - for personal use only" OFF)
|
||||||
# on windows always build external libraries
|
# on windows always build external libraries
|
||||||
if(WIN32)
|
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()
|
# to run fixup_bundle()
|
||||||
option(BUNDLE "Enable distribution bundle" ON)
|
set(BUNDLE ON CACHE BOOL "Enable distribution bundle" FORCE)
|
||||||
else()
|
|
||||||
option(ENABLE_EXTERNAL_LIBRARIES "Build external libraries" OFF)
|
|
||||||
option(BUNDLE "Enable distribution bundle" OFF)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Set additional project information
|
# Set additional project information
|
||||||
|
@ -186,7 +183,6 @@ elseif(APPLE)
|
||||||
configure_file("${CMAKE_SOURCE_DIR}/cmake/cpack/MacOSXBundleInfo.plist.in"
|
configure_file("${CMAKE_SOURCE_DIR}/cmake/cpack/MacOSXBundleInfo.plist.in"
|
||||||
"${CMAKE_BINARY_DIR}/Info.plist" @ONLY)
|
"${CMAKE_BINARY_DIR}/Info.plist" @ONLY)
|
||||||
elseif (WIN32)
|
elseif (WIN32)
|
||||||
# check compiler version
|
|
||||||
# check compiler version
|
# check compiler version
|
||||||
if(MSVC_VERSION GREATER 1910 AND MSVC_VERSION LESS 1919)
|
if(MSVC_VERSION GREATER 1910 AND MSVC_VERSION LESS 1919)
|
||||||
set(VS2017 ON)
|
set(VS2017 ON)
|
||||||
|
|
|
@ -302,9 +302,9 @@ elseif(WIN32 OR MINGW)
|
||||||
"CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\SDRangel.lnk' '$INSTDIR\\\\sdrangel.exe'")
|
"CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\SDRangel.lnk' '$INSTDIR\\\\sdrangel.exe'")
|
||||||
set(CPACK_NSIS_DELETE_ICONS_EXTRA
|
set(CPACK_NSIS_DELETE_ICONS_EXTRA
|
||||||
"Delete '$SMPROGRAMS\\\\$START_MENU\\\\SDRangel.lnk'")
|
"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}")
|
message(STATUS "CPack generators: ${CPACK_GENERATOR}")
|
||||||
include(CPack)
|
include(CPack)
|
||||||
|
|
Ładowanie…
Reference in New Issue