Skip to content

add back Visual C++ Redistributable #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nschimme merged 2 commits into from
Dec 19, 2025
Merged

add back Visual C++ Redistributable #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df81b89
add back Visual C++ Redistributable to NSIS
nschimme Dec 19, 2025
701409f
fix version fallback when git tags are missing
nschimme Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,11 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
set(MMAPPER_BETA "false")
else()
message(STATUS "Building from branch ${GIT_BRANCH} with ref ${GIT_TAG_COMMIT_HASH}")
set(MMAPPER_VERSION_STRING "${GIT_TAG_COMMIT_HASH}")
if(NOT GIT_TAG_COMMIT_HASH MATCHES "^v")
set(MMAPPER_VERSION_STRING "v${MMAPPER_VERSION}-${GIT_TAG_COMMIT_HASH}")
else()
set(MMAPPER_VERSION_STRING "${GIT_TAG_COMMIT_HASH}")
endif()
set(MMAPPER_BETA "true")
endif()
endif()
Expand Down
22 changes: 14 additions & 8 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,18 +1002,24 @@ if(WIN32)
USE_SOURCE_PERMISSIONS
PATTERN "*.exe" EXCLUDE
)
if(MSVC)
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
ExecWait '\\$INSTDIR\\\\vc_redist.x64.exe /q /norestart'
Delete '\\$INSTDIR\\\\vc_redist.x64.exe'
")
endif()

set(CPACK_SOURCE_GENERATOR "ZIP")

if(WITH_UPDATER)
if(PACKAGE_TYPE_NORMALIZED STREQUAL "Nsis")
set(CPACK_GENERATOR "NSIS")

if(MSVC AND NOT MMAPPER_IS_DEBUG)
install(FILES
"${WINDEPLOYQT_STAGING}/vc_redist.x64.exe"
DESTINATION .
COMPONENT libraries
)
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
ExecWait '\\$INSTDIR\\\\vc_redist.x64.exe /q /norestart'
Delete '\\$INSTDIR\\\\vc_redist.x64.exe'
")
endif()

# Windows (NSIS) Settings
set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
set(CPACK_NSIS_MENU_LINKS "mmapper.exe;MMapper")
Expand Down Expand Up @@ -1052,7 +1058,7 @@ if(WIN32)
endif()
# NSIS always displays a license page
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING.txt")
else()
elseif(PACKAGE_TYPE_NORMALIZED STREQUAL "AppX")
# Windows AppX Settings
set(CPACK_GENERATOR "External")
set(APPX_NAME "${PROJECT_NAME}")
Expand Down