emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Since CPack can miss some system DLLs, make option ADD_SYSTEM_RUNTIMES, def OFF

Browse source
This commit is contained in:
Geoff McLane 2017-03-23 15:13:28 +01:00
parent 25f51604d0
commit 22bc8da583
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -344,13 +344,17 @@ endif()
### TODO: Check each of these builds ### TODO: Check each of these builds
########################################################## ##########################################################
# Need to ensure that system dlls get included in a binary distribution # Need to ensure that system dlls get included in a binary distribution
if (NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS) # But since it can miss some... seems incomplete, make optionional
option( ADD_SYSTEM_RUNTIMES "Set ON to include system runtime DLLS in distribution" OFF )
if (MSVC AND ADD_SYSTEM_RUNTIMES)
if (NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
# Visual Studio Express does include redistributable components so # Visual Studio Express does include redistributable components so
# squelch the warning. # squelch the warning.
set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON) set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
endif ()
set (CMAKE_INSTALL_DEBUG_LIBRARIES OFF)
include (InstallRequiredSystemLibraries)
endif () endif ()
set (CMAKE_INSTALL_DEBUG_LIBRARIES OFF)
include (InstallRequiredSystemLibraries)
########################################################## ##########################################################
if (WIN32) if (WIN32)
# MSI - this needs WiX Tooset installed and a path to candle.exe # MSI - this needs WiX Tooset installed and a path to candle.exe