mirror of
https://github.com/cjcliffe/CubicSDR.git
synced 2024-11-22 03:36:24 -05:00
Remove installer binaries; moving externals to winbuild project
This commit is contained in:
parent
ba7a35c336
commit
4fb3088936
@ -956,7 +956,8 @@ IF (WIN32 AND BUILD_INSTALLER)
|
||||
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CUBICSDR_INSTALL_NAME} ${CPACK_PACKAGE_VERSION} (x86)")
|
||||
set(CMAKE_CL_64 FALSE)
|
||||
ENDIF(EX_PLATFORM EQUAL 64)
|
||||
|
||||
SET(BUNDLE_MSVC_REDIST "" CACHE STRING "Visual C++ Redistributable")
|
||||
|
||||
set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
|
||||
install(TARGETS CubicSDR RUNTIME DESTINATION .)
|
||||
|
||||
@ -1011,8 +1012,13 @@ IF (WIN32 AND BUILD_INSTALLER)
|
||||
set(CPACK_PACKAGE_EXECUTABLES CubicSDR "CubicSDR")
|
||||
|
||||
IF (MSVC)
|
||||
install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/external/msvc/${EX_PLATFORM_NAME}/vc_redist.${EX_PLATFORM_NAME}.exe DESTINATION vc_redist)
|
||||
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vc_redist\\\\vc_redist.${EX_PLATFORM_NAME}.exe\\\" /passive /norestart'")
|
||||
IF (BUNDLE_MSVC_REDIST)
|
||||
message(STATUS "BUNDLE_MSVC_REDIST: ${BUNDLE_MSVC_REDIST}")
|
||||
cmake_path(GET BUNDLE_MSVC_REDIST FILENAME BUNDLE_MSVC_REDIST_FN)
|
||||
message(STATUS "BUNDLE_MSVC_REDIST_FN: ${BUNDLE_MSVC_REDIST_FN}")
|
||||
install(PROGRAMS ${BUNDLE_MSVC_REDIST} DESTINATION vc_redist)
|
||||
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vc_redist\\\\${BUNDLE_MSVC_REDIST_FN}\\\" /passive /norestart'")
|
||||
ENDIF()
|
||||
ENDIF (MSVC)
|
||||
|
||||
|
||||
|
BIN
external/msvc/x64/libwinpthread-1.dll
vendored
BIN
external/msvc/x64/libwinpthread-1.dll
vendored
Binary file not shown.
BIN
external/msvc/x64/vc_redist.x64.exe
vendored
BIN
external/msvc/x64/vc_redist.x64.exe
vendored
Binary file not shown.
Loading…
Reference in New Issue
Block a user