mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 11:28:03 +02:00
don't use cmake sys library install, grab vcredist as external
This commit is contained in:
parent
c329a58c14
commit
008b4285f5
2 changed files with 21 additions and 5 deletions
21
cmake/externals/vcredist/CMakeLists.txt
vendored
Normal file
21
cmake/externals/vcredist/CMakeLists.txt
vendored
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
if (WIN32)
|
||||||
|
set(EXTERNAL_NAME vcredist)
|
||||||
|
string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
|
||||||
|
|
||||||
|
include(ExternalProject)
|
||||||
|
ExternalProject_Add(
|
||||||
|
${EXTERNAL_NAME}
|
||||||
|
URL https://go.microsoft.com/fwlink/?LinkId=746572
|
||||||
|
CONFIGURE_COMMAND ""
|
||||||
|
BUILD_COMMAND ""
|
||||||
|
INSTALL_COMMAND ""
|
||||||
|
LOG_DOWNLOAD 1
|
||||||
|
)
|
||||||
|
|
||||||
|
# Hide this external target (for ide users)
|
||||||
|
set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
|
||||||
|
|
||||||
|
ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
|
||||||
|
|
||||||
|
set(${EXTERNAL_NAME_UPPER}_PATH ${SOURCE_DIR} CACHE FILEPATH "Location of VC Redistributable")
|
||||||
|
endif()
|
|
@ -29,10 +29,6 @@ macro(GENERATE_INSTALLERS)
|
||||||
|
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
# Do not install the Visual Studio C runtime libraries. The installer will do this automatically
|
|
||||||
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
|
|
||||||
|
|
||||||
include(InstallRequiredSystemLibraries)
|
|
||||||
set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/installer.ico")
|
set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/installer.ico")
|
||||||
|
|
||||||
# install and reference the Add/Remove icon
|
# install and reference the Add/Remove icon
|
||||||
|
@ -84,4 +80,3 @@ macro(GENERATE_INSTALLERS)
|
||||||
|
|
||||||
include(CPack)
|
include(CPack)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue