[Alchemy sync] Switch from shipping vc_redist to shipping the dll's from the build host.
This commit is contained in:
Router Gray
@@ -38,7 +38,6 @@ set(cmake_SOURCE_FILES
|
|||||||
FindNDOF.cmake
|
FindNDOF.cmake
|
||||||
FindOpenJPEG.cmake
|
FindOpenJPEG.cmake
|
||||||
FindTut.cmake
|
FindTut.cmake
|
||||||
FindVCRedist.cmake
|
|
||||||
FindURIPARSER.cmake
|
FindURIPARSER.cmake
|
||||||
FindXmlRpcEpi.cmake
|
FindXmlRpcEpi.cmake
|
||||||
FMODSTUDIO.cmake
|
FMODSTUDIO.cmake
|
||||||
|
|||||||
@@ -13,6 +13,10 @@ include(LLCommon)
|
|||||||
# set up platform specific lists of files that need to be copied
|
# set up platform specific lists of files that need to be copied
|
||||||
###################################################################
|
###################################################################
|
||||||
if(WINDOWS)
|
if(WINDOWS)
|
||||||
|
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
|
||||||
|
set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
|
||||||
|
include(InstallRequiredSystemLibrariesAL)
|
||||||
|
|
||||||
set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/Debug")
|
set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/Debug")
|
||||||
set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo")
|
set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo")
|
||||||
set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}/Release")
|
set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}/Release")
|
||||||
@@ -87,6 +91,26 @@ if(WINDOWS)
|
|||||||
set(release_files ${release_files} fmod.dll)
|
set(release_files ${release_files} fmod.dll)
|
||||||
endif (FMODSTUDIO)
|
endif (FMODSTUDIO)
|
||||||
|
|
||||||
|
foreach(redistfullfile IN LISTS CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
|
||||||
|
get_filename_component(redistfilepath ${redistfullfile} DIRECTORY )
|
||||||
|
get_filename_component(redistfilename ${redistfullfile} NAME)
|
||||||
|
copy_if_different(
|
||||||
|
${redistfilepath}
|
||||||
|
"${SHARED_LIB_STAGING_DIR_RELEASE}"
|
||||||
|
out_targets
|
||||||
|
${redistfilename}
|
||||||
|
)
|
||||||
|
set(third_party_targets ${third_party_targets} ${out_targets})
|
||||||
|
|
||||||
|
copy_if_different(
|
||||||
|
${redistfilepath}
|
||||||
|
"${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
|
||||||
|
out_targets
|
||||||
|
${redistfilename}
|
||||||
|
)
|
||||||
|
set(third_party_targets ${third_party_targets} ${out_targets})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
elseif(DARWIN)
|
elseif(DARWIN)
|
||||||
set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/Debug/Resources")
|
set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/Debug/Resources")
|
||||||
set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
|
set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
include(Variables)
|
|
||||||
|
|
||||||
if(WINDOWS)
|
|
||||||
if(MSVC_VERSION GREATER_EQUAL 1919 AND MSVC_VERSION LESS 1920)
|
|
||||||
set(VISUAL_STUDIO_VERSION 15.0)
|
|
||||||
set(VISUAL_STUDIO_VERSION_UPPER 16.0)
|
|
||||||
elseif(MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940)
|
|
||||||
set(VISUAL_STUDIO_VERSION 16.0)
|
|
||||||
set(VISUAL_STUDIO_VERSION_UPPER 17.0)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
set(vswhere "$ENV{PROGRAMFILES\(X86\)}\\Microsoft Visual Studio\\Installer\\vswhere.exe")
|
|
||||||
if(EXISTS ${vswhere})
|
|
||||||
execute_process(COMMAND ${vswhere} -version "[${VISUAL_STUDIO_VERSION},${VISUAL_STUDIO_VERSION_UPPER})" -property "installationPath"
|
|
||||||
OUTPUT_VARIABLE installationPath
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
||||||
file(TO_CMAKE_PATH ${installationPath} installationPath)
|
|
||||||
set(redistPath "${installationPath}/VC/Redist/MSVC")
|
|
||||||
file(GLOB redistPath "${installationPath}/VC/Redist/MSVC/*")
|
|
||||||
list(LENGTH redistPath length)
|
|
||||||
if(length EQUAL 1)
|
|
||||||
if(ADDRESS_SIZE EQUAL 64)
|
|
||||||
set(VISUAL_STUDIO_REDISTRIBUTABLE_NAME "vc_redist.x64.exe" CACHE FILEPATH "Name of Microsoft Visual Studio Redistributable")
|
|
||||||
set(redistPath "${redistPath}/${VISUAL_STUDIO_REDISTRIBUTABLE_NAME}")
|
|
||||||
else()
|
|
||||||
set(VISUAL_STUDIO_REDISTRIBUTABLE_NAME "vc_redist.x86.exe" CACHE FILEPATH "Name of Microsoft Visual Studio Redistributable")
|
|
||||||
set(redistPath "${redistPath}/${VISUAL_STUDIO_REDISTRIBUTABLE_NAME}")
|
|
||||||
endif()
|
|
||||||
if(EXISTS ${redistPath})
|
|
||||||
set(VISUAL_STUDIO_REDISTRIBUTABLE_PATH ${redistPath} CACHE FILEPATH "Path to the appropriate Microsoft Visual Studio Redistributable")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif(WINDOWS)
|
|
||||||
741
indra/cmake/InstallRequiredSystemLibrariesAL.cmake
Normal file
741
indra/cmake/InstallRequiredSystemLibrariesAL.cmake
Normal file
@@ -0,0 +1,741 @@
|
|||||||
|
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||||
|
# file Copyright.txt or https://cmake.org/licensing for details.
|
||||||
|
|
||||||
|
#[=======================================================================[.rst:
|
||||||
|
InstallRequiredSystemLibraries
|
||||||
|
------------------------------
|
||||||
|
|
||||||
|
Include this module to search for compiler-provided system runtime
|
||||||
|
libraries and add install rules for them. Some optional variables
|
||||||
|
may be set prior to including the module to adjust behavior:
|
||||||
|
|
||||||
|
``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS``
|
||||||
|
Specify additional runtime libraries that may not be detected.
|
||||||
|
After inclusion any detected libraries will be appended to this.
|
||||||
|
|
||||||
|
``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP``
|
||||||
|
Set to TRUE to skip calling the :command:`install(PROGRAMS)` command to
|
||||||
|
allow the includer to specify its own install rule, using the value of
|
||||||
|
``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS`` to get the list of libraries.
|
||||||
|
|
||||||
|
``CMAKE_INSTALL_DEBUG_LIBRARIES``
|
||||||
|
Set to TRUE to install the debug runtime libraries when available
|
||||||
|
with MSVC tools.
|
||||||
|
|
||||||
|
``CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY``
|
||||||
|
Set to TRUE to install only the debug runtime libraries with MSVC
|
||||||
|
tools even if the release runtime libraries are also available.
|
||||||
|
|
||||||
|
``CMAKE_INSTALL_UCRT_LIBRARIES``
|
||||||
|
Set to TRUE to install the Windows Universal CRT libraries for
|
||||||
|
app-local deployment (e.g. to Windows XP). This is meaningful
|
||||||
|
only with MSVC from Visual Studio 2015 or higher.
|
||||||
|
|
||||||
|
One may set a ``CMAKE_WINDOWS_KITS_10_DIR`` *environment variable*
|
||||||
|
to an absolute path to tell CMake to look for Windows 10 SDKs in
|
||||||
|
a custom location. The specified directory is expected to contain
|
||||||
|
``Redist/ucrt/DLLs/*`` directories.
|
||||||
|
|
||||||
|
``CMAKE_INSTALL_MFC_LIBRARIES``
|
||||||
|
Set to TRUE to install the MSVC MFC runtime libraries.
|
||||||
|
|
||||||
|
``CMAKE_INSTALL_OPENMP_LIBRARIES``
|
||||||
|
Set to TRUE to install the MSVC OpenMP runtime libraries
|
||||||
|
|
||||||
|
``CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION``
|
||||||
|
Specify the :command:`install(PROGRAMS)` command ``DESTINATION``
|
||||||
|
option. If not specified, the default is ``bin`` on Windows
|
||||||
|
and ``lib`` elsewhere.
|
||||||
|
|
||||||
|
``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS``
|
||||||
|
Set to TRUE to disable warnings about required library files that
|
||||||
|
do not exist. (For example, Visual Studio Express editions may
|
||||||
|
not provide the redistributable files.)
|
||||||
|
|
||||||
|
``CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT``
|
||||||
|
Specify the :command:`install(PROGRAMS)` command ``COMPONENT``
|
||||||
|
option. If not specified, no such option will be used.
|
||||||
|
#]=======================================================================]
|
||||||
|
|
||||||
|
cmake_policy(PUSH)
|
||||||
|
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
|
||||||
|
|
||||||
|
set(_IRSL_HAVE_Intel FALSE)
|
||||||
|
set(_IRSL_HAVE_MSVC FALSE)
|
||||||
|
foreach(LANG IN ITEMS C CXX Fortran)
|
||||||
|
if("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "Intel")
|
||||||
|
if(NOT _IRSL_HAVE_Intel)
|
||||||
|
get_filename_component(_Intel_basedir "${CMAKE_${LANG}_COMPILER}" PATH)
|
||||||
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||||
|
set(_Intel_archdir intel64)
|
||||||
|
else()
|
||||||
|
set(_Intel_archdir x86)
|
||||||
|
endif()
|
||||||
|
set(_Intel_compiler_ver ${CMAKE_${LANG}_COMPILER_VERSION})
|
||||||
|
if(WIN32)
|
||||||
|
get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../redist/${_Intel_archdir}/compiler" ABSOLUTE)
|
||||||
|
elseif(APPLE)
|
||||||
|
get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../compiler/lib" ABSOLUTE)
|
||||||
|
else()
|
||||||
|
if(EXISTS "${_Intel_basedir}/../lib/${_Intel_archdir}_lin")
|
||||||
|
get_filename_component(_Intel_redistdir "${_Intel_basedir}/../lib/${_Intel_archdir}" ABSOLUTE)
|
||||||
|
else()
|
||||||
|
get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../compiler/lib/${_Intel_archdir}_lin" ABSOLUTE)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
set(_IRSL_HAVE_Intel TRUE)
|
||||||
|
endif()
|
||||||
|
elseif("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "MSVC")
|
||||||
|
set(_IRSL_HAVE_MSVC TRUE)
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
file(TO_CMAKE_PATH "$ENV{SYSTEMROOT}" SYSTEMROOT)
|
||||||
|
|
||||||
|
if(CMAKE_CL_64)
|
||||||
|
if(MSVC_VERSION GREATER 1599)
|
||||||
|
# VS 10 and later:
|
||||||
|
set(CMAKE_MSVC_ARCH x64)
|
||||||
|
else()
|
||||||
|
# VS 9 and earlier:
|
||||||
|
set(CMAKE_MSVC_ARCH amd64)
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
set(CMAKE_MSVC_ARCH x86)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
get_filename_component(devenv_dir "${CMAKE_MAKE_PROGRAM}" PATH)
|
||||||
|
get_filename_component(base_dir "${devenv_dir}/../.." ABSOLUTE)
|
||||||
|
|
||||||
|
if(MSVC_VERSION EQUAL 1300)
|
||||||
|
set(__install__libs
|
||||||
|
"${SYSTEMROOT}/system32/msvcp70.dll"
|
||||||
|
"${SYSTEMROOT}/system32/msvcr70.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(MSVC_VERSION EQUAL 1310)
|
||||||
|
set(__install__libs
|
||||||
|
"${SYSTEMROOT}/system32/msvcp71.dll"
|
||||||
|
"${SYSTEMROOT}/system32/msvcr71.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(MSVC_TOOLSET_VERSION EQUAL 80)
|
||||||
|
# Find the runtime library redistribution directory.
|
||||||
|
get_filename_component(msvc_install_dir
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0;InstallDir]" ABSOLUTE)
|
||||||
|
if(DEFINED MSVC80_REDIST_DIR AND EXISTS "${MSVC80_REDIST_DIR}")
|
||||||
|
set(MSVC_REDIST_DIR "${MSVC80_REDIST_DIR}") # use old cache entry
|
||||||
|
endif()
|
||||||
|
find_path(MSVC_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest
|
||||||
|
PATHS
|
||||||
|
"${msvc_install_dir}/../../VC/redist"
|
||||||
|
"${base_dir}/VC/redist"
|
||||||
|
)
|
||||||
|
mark_as_advanced(MSVC_REDIST_DIR)
|
||||||
|
set(MSVC_CRT_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT")
|
||||||
|
|
||||||
|
# Install the manifest that allows DLLs to be loaded from the
|
||||||
|
# directory containing the executable.
|
||||||
|
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
|
||||||
|
set(__install__libs
|
||||||
|
"${MSVC_CRT_DIR}/Microsoft.VC80.CRT.manifest"
|
||||||
|
"${MSVC_CRT_DIR}/msvcm80.dll"
|
||||||
|
"${MSVC_CRT_DIR}/msvcp80.dll"
|
||||||
|
"${MSVC_CRT_DIR}/msvcr80.dll"
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
set(__install__libs)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_INSTALL_DEBUG_LIBRARIES)
|
||||||
|
set(MSVC_CRT_DIR
|
||||||
|
"${MSVC_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugCRT")
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_CRT_DIR}/Microsoft.VC80.DebugCRT.manifest"
|
||||||
|
"${MSVC_CRT_DIR}/msvcm80d.dll"
|
||||||
|
"${MSVC_CRT_DIR}/msvcp80d.dll"
|
||||||
|
"${MSVC_CRT_DIR}/msvcr80d.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(MSVC_TOOLSET_VERSION EQUAL 90)
|
||||||
|
# Find the runtime library redistribution directory.
|
||||||
|
get_filename_component(msvc_install_dir
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0;InstallDir]" ABSOLUTE)
|
||||||
|
get_filename_component(msvc_express_install_dir
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\9.0;InstallDir]" ABSOLUTE)
|
||||||
|
if(DEFINED MSVC90_REDIST_DIR AND EXISTS "${MSVC90_REDIST_DIR}")
|
||||||
|
set(MSVC_REDIST_DIR "${MSVC90_REDIST_DIR}") # use old cache entry
|
||||||
|
endif()
|
||||||
|
find_path(MSVC_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
|
||||||
|
PATHS
|
||||||
|
"${msvc_install_dir}/../../VC/redist"
|
||||||
|
"${msvc_express_install_dir}/../../VC/redist"
|
||||||
|
"${base_dir}/VC/redist"
|
||||||
|
)
|
||||||
|
mark_as_advanced(MSVC_REDIST_DIR)
|
||||||
|
set(MSVC_CRT_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT")
|
||||||
|
|
||||||
|
# Install the manifest that allows DLLs to be loaded from the
|
||||||
|
# directory containing the executable.
|
||||||
|
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
|
||||||
|
set(__install__libs
|
||||||
|
"${MSVC_CRT_DIR}/Microsoft.VC90.CRT.manifest"
|
||||||
|
"${MSVC_CRT_DIR}/msvcm90.dll"
|
||||||
|
"${MSVC_CRT_DIR}/msvcp90.dll"
|
||||||
|
"${MSVC_CRT_DIR}/msvcr90.dll"
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
set(__install__libs)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_INSTALL_DEBUG_LIBRARIES)
|
||||||
|
set(MSVC_CRT_DIR
|
||||||
|
"${MSVC_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugCRT")
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_CRT_DIR}/Microsoft.VC90.DebugCRT.manifest"
|
||||||
|
"${MSVC_CRT_DIR}/msvcm90d.dll"
|
||||||
|
"${MSVC_CRT_DIR}/msvcp90d.dll"
|
||||||
|
"${MSVC_CRT_DIR}/msvcr90d.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(MSVC_REDIST_NAME "")
|
||||||
|
set(_MSVC_DLL_VERSION "")
|
||||||
|
set(_MSVC_IDE_VERSION "")
|
||||||
|
if(MSVC_VERSION GREATER_EQUAL 2000)
|
||||||
|
message(WARNING "MSVC ${MSVC_VERSION} not yet supported.")
|
||||||
|
elseif(MSVC_VERSION_VERSION GREATER_EQUAL 143)
|
||||||
|
message(WARNING "MSVC toolset v${MSVC_VERSION_VERSION} not yet supported.")
|
||||||
|
elseif(MSVC_TOOLSET_VERSION EQUAL 142)
|
||||||
|
set(MSVC_REDIST_NAME VC142)
|
||||||
|
set(_MSVC_DLL_VERSION 140)
|
||||||
|
set(_MSVC_IDE_VERSION 16)
|
||||||
|
if(MSVC_VERSION EQUAL 1920)
|
||||||
|
# VS2019 named this differently prior to update 1.
|
||||||
|
set(MSVC_REDIST_NAME VC141)
|
||||||
|
endif()
|
||||||
|
elseif(MSVC_TOOLSET_VERSION EQUAL 141)
|
||||||
|
set(MSVC_REDIST_NAME VC141)
|
||||||
|
set(_MSVC_DLL_VERSION 140)
|
||||||
|
set(_MSVC_IDE_VERSION 15)
|
||||||
|
if(MSVC_VERSION EQUAL 1910)
|
||||||
|
# VS2017 named this differently prior to update 3.
|
||||||
|
set(MSVC_REDIST_NAME VC150)
|
||||||
|
endif()
|
||||||
|
elseif(MSVC_TOOLSET_VERSION)
|
||||||
|
set(MSVC_REDIST_NAME VC${MSVC_TOOLSET_VERSION})
|
||||||
|
math(EXPR _MSVC_DLL_VERSION "${MSVC_TOOLSET_VERSION} / 10 * 10")
|
||||||
|
math(EXPR _MSVC_IDE_VERSION "${MSVC_TOOLSET_VERSION} / 10")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(_MSVCRT_DLL_VERSION "")
|
||||||
|
set(_MSVCRT_IDE_VERSION "")
|
||||||
|
if(_MSVC_IDE_VERSION GREATER_EQUAL 10)
|
||||||
|
set(_MSVCRT_DLL_VERSION "${_MSVC_DLL_VERSION}")
|
||||||
|
set(_MSVCRT_IDE_VERSION "${_MSVC_IDE_VERSION}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(_MSVCRT_DLL_VERSION)
|
||||||
|
set(v "${_MSVCRT_DLL_VERSION}")
|
||||||
|
set(vs "${_MSVCRT_IDE_VERSION}")
|
||||||
|
|
||||||
|
# Find the runtime library redistribution directory.
|
||||||
|
if(vs VERSION_LESS 15 AND DEFINED MSVC${vs}_REDIST_DIR AND EXISTS "${MSVC${vs}_REDIST_DIR}")
|
||||||
|
set(MSVC_REDIST_DIR "${MSVC${vs}_REDIST_DIR}") # use old cache entry
|
||||||
|
endif()
|
||||||
|
if(NOT vs VERSION_LESS 15)
|
||||||
|
set(_vs_redist_paths "")
|
||||||
|
cmake_host_system_information(RESULT _vs_dir QUERY VS_${vs}_DIR) # undocumented query
|
||||||
|
if(IS_DIRECTORY "${_vs_dir}")
|
||||||
|
file(GLOB _vs_redist_paths "${_vs_dir}/VC/Redist/MSVC/*")
|
||||||
|
endif()
|
||||||
|
unset(_vs_dir)
|
||||||
|
else()
|
||||||
|
get_filename_component(_vs_dir
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${vs}.0;InstallDir]" ABSOLUTE)
|
||||||
|
set(programfilesx86 "ProgramFiles(x86)")
|
||||||
|
set(_vs_redist_paths
|
||||||
|
"${_vs_dir}/../../VC/redist"
|
||||||
|
"${base_dir}/VC/redist"
|
||||||
|
"$ENV{ProgramFiles}/Microsoft Visual Studio ${vs}.0/VC/redist"
|
||||||
|
"$ENV{${programfilesx86}}/Microsoft Visual Studio ${vs}.0/VC/redist"
|
||||||
|
)
|
||||||
|
unset(_vs_dir)
|
||||||
|
unset(programfilesx86)
|
||||||
|
endif()
|
||||||
|
find_path(MSVC_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.CRT PATHS ${_vs_redist_paths})
|
||||||
|
unset(_vs_redist_paths)
|
||||||
|
mark_as_advanced(MSVC_REDIST_DIR)
|
||||||
|
set(MSVC_CRT_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.CRT")
|
||||||
|
|
||||||
|
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
|
||||||
|
set(__install__libs
|
||||||
|
"${MSVC_CRT_DIR}/msvcp${v}.dll"
|
||||||
|
)
|
||||||
|
if(NOT vs VERSION_LESS 14)
|
||||||
|
file(GLOB __msvcr_dlls "${MSVC_CRT_DIR}/*.dll")
|
||||||
|
list(APPEND __install__libs ${__msvcr_dlls})
|
||||||
|
else()
|
||||||
|
list(APPEND __install__libs "${MSVC_CRT_DIR}/msvcr${v}.dll")
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
set(__install__libs)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_INSTALL_DEBUG_LIBRARIES)
|
||||||
|
set(MSVC_CRT_DIR
|
||||||
|
"${MSVC_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.DebugCRT")
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_CRT_DIR}/msvcp${v}d.dll"
|
||||||
|
)
|
||||||
|
if(NOT vs VERSION_LESS 14)
|
||||||
|
list(APPEND __install__libs
|
||||||
|
"${MSVC_CRT_DIR}/vcruntime${v}d.dll"
|
||||||
|
"${MSVC_CRT_DIR}/concrt${v}d.dll"
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
list(APPEND __install__libs "${MSVC_CRT_DIR}/msvcr${v}d.dll")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_INSTALL_UCRT_LIBRARIES AND NOT vs VERSION_LESS 14)
|
||||||
|
# Find the Windows Kits directory.
|
||||||
|
get_filename_component(windows_kits_dir
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot10]" ABSOLUTE)
|
||||||
|
set(programfilesx86 "ProgramFiles(x86)")
|
||||||
|
if(";${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION};$ENV{UCRTVersion};$ENV{WindowsSDKVersion};" MATCHES [=[;(10\.[0-9.]+)[;\]]=])
|
||||||
|
set(__ucrt_version "${CMAKE_MATCH_1}/")
|
||||||
|
else()
|
||||||
|
set(__ucrt_version "")
|
||||||
|
endif()
|
||||||
|
find_path(WINDOWS_KITS_DIR
|
||||||
|
NAMES
|
||||||
|
Redist/${__ucrt_version}ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll
|
||||||
|
Redist/ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll
|
||||||
|
PATHS
|
||||||
|
$ENV{CMAKE_WINDOWS_KITS_10_DIR}
|
||||||
|
"${windows_kits_dir}"
|
||||||
|
"$ENV{ProgramFiles}/Windows Kits/10"
|
||||||
|
"$ENV{${programfilesx86}}/Windows Kits/10"
|
||||||
|
)
|
||||||
|
mark_as_advanced(WINDOWS_KITS_DIR)
|
||||||
|
|
||||||
|
# Glob the list of UCRT DLLs.
|
||||||
|
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
|
||||||
|
if(EXISTS "${WINDOWS_KITS_DIR}/Redist/${__ucrt_version}ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll")
|
||||||
|
file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/Redist/${__ucrt_version}ucrt/DLLs/${CMAKE_MSVC_ARCH}/*.dll")
|
||||||
|
else()
|
||||||
|
file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/Redist/ucrt/DLLs/${CMAKE_MSVC_ARCH}/*.dll")
|
||||||
|
endif()
|
||||||
|
list(APPEND __install__libs ${__ucrt_dlls})
|
||||||
|
endif()
|
||||||
|
if(CMAKE_INSTALL_DEBUG_LIBRARIES)
|
||||||
|
if(EXISTS "${WINDOWS_KITS_DIR}/bin/${__ucrt_version}${CMAKE_MSVC_ARCH}/ucrt/ucrtbased.dll")
|
||||||
|
file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/bin/${__ucrt_version}${CMAKE_MSVC_ARCH}/ucrt/*.dll")
|
||||||
|
else()
|
||||||
|
file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/bin/${CMAKE_MSVC_ARCH}/ucrt/*.dll")
|
||||||
|
endif()
|
||||||
|
list(APPEND __install__libs ${__ucrt_dlls})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_INSTALL_MFC_LIBRARIES)
|
||||||
|
if(MSVC_VERSION EQUAL 1300)
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${SYSTEMROOT}/system32/mfc70.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(MSVC_VERSION EQUAL 1310)
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${SYSTEMROOT}/system32/mfc71.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(MSVC_VERSION EQUAL 1400)
|
||||||
|
if(CMAKE_INSTALL_DEBUG_LIBRARIES)
|
||||||
|
set(MSVC_MFC_DIR
|
||||||
|
"${MSVC_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugMFC")
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFC_DIR}/Microsoft.VC80.DebugMFC.manifest"
|
||||||
|
"${MSVC_MFC_DIR}/mfc80d.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfc80ud.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfcm80d.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfcm80ud.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(MSVC_MFC_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFC")
|
||||||
|
# Install the manifest that allows DLLs to be loaded from the
|
||||||
|
# directory containing the executable.
|
||||||
|
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFC_DIR}/Microsoft.VC80.MFC.manifest"
|
||||||
|
"${MSVC_MFC_DIR}/mfc80.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfc80u.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfcm80.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfcm80u.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# include the language dll's for vs8 as well as the actual dll's
|
||||||
|
set(MSVC_MFCLOC_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFCLOC")
|
||||||
|
# Install the manifest that allows DLLs to be loaded from the
|
||||||
|
# directory containing the executable.
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFCLOC_DIR}/Microsoft.VC80.MFCLOC.manifest"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc80chs.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc80cht.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc80enu.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc80esp.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc80deu.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc80fra.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc80ita.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc80jpn.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc80kor.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(MSVC_VERSION EQUAL 1500)
|
||||||
|
if(CMAKE_INSTALL_DEBUG_LIBRARIES)
|
||||||
|
set(MSVC_MFC_DIR
|
||||||
|
"${MSVC_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugMFC")
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFC_DIR}/Microsoft.VC90.DebugMFC.manifest"
|
||||||
|
"${MSVC_MFC_DIR}/mfc90d.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfc90ud.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfcm90d.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfcm90ud.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(MSVC_MFC_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFC")
|
||||||
|
# Install the manifest that allows DLLs to be loaded from the
|
||||||
|
# directory containing the executable.
|
||||||
|
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFC_DIR}/Microsoft.VC90.MFC.manifest"
|
||||||
|
"${MSVC_MFC_DIR}/mfc90.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfc90u.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfcm90.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfcm90u.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# include the language dll's for vs9 as well as the actual dll's
|
||||||
|
set(MSVC_MFCLOC_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFCLOC")
|
||||||
|
# Install the manifest that allows DLLs to be loaded from the
|
||||||
|
# directory containing the executable.
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFCLOC_DIR}/Microsoft.VC90.MFCLOC.manifest"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc90chs.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc90cht.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc90enu.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc90esp.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc90deu.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc90fra.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc90ita.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc90jpn.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc90kor.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(_MFC_DLL_VERSION "")
|
||||||
|
set(_MFC_IDE_VERSION "")
|
||||||
|
if(_MSVC_IDE_VERSION GREATER_EQUAL 10)
|
||||||
|
set(_MFC_DLL_VERSION ${_MSVC_DLL_VERSION})
|
||||||
|
set(_MFC_IDE_VERSION ${_MSVC_IDE_VERSION})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(_MFC_DLL_VERSION)
|
||||||
|
set(v "${_MFC_DLL_VERSION}")
|
||||||
|
set(vs "${_MFC_IDE_VERSION}")
|
||||||
|
|
||||||
|
# Starting with VS 15 the MFC DLLs may be in a different directory.
|
||||||
|
if (NOT vs VERSION_LESS 15)
|
||||||
|
file(GLOB _MSVC_REDIST_DIRS "${MSVC_REDIST_DIR}/../*")
|
||||||
|
find_path(MSVC_REDIST_MFC_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.MFC
|
||||||
|
PATHS ${_MSVC_REDIST_DIRS} NO_DEFAULT_PATH)
|
||||||
|
mark_as_advanced(MSVC_REDIST_MFC_DIR)
|
||||||
|
unset(_MSVC_REDIST_DIRS)
|
||||||
|
else()
|
||||||
|
set(MSVC_REDIST_MFC_DIR "${MSVC_REDIST_DIR}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Multi-Byte Character Set versions of MFC are available as optional
|
||||||
|
# addon since Visual Studio 12. So for version 12 or higher, check
|
||||||
|
# whether they are available and exclude them if they are not.
|
||||||
|
|
||||||
|
if(CMAKE_INSTALL_DEBUG_LIBRARIES)
|
||||||
|
set(MSVC_MFC_DIR
|
||||||
|
"${MSVC_REDIST_MFC_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.DebugMFC")
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFC_DIR}/mfc${v}ud.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfcm${v}ud.dll"
|
||||||
|
)
|
||||||
|
if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfc${v}d.dll")
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFC_DIR}/mfc${v}d.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfcm${v}d.dll")
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFC_DIR}/mfcm${v}d.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(MSVC_MFC_DIR "${MSVC_REDIST_MFC_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.MFC")
|
||||||
|
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFC_DIR}/mfc${v}u.dll"
|
||||||
|
"${MSVC_MFC_DIR}/mfcm${v}u.dll"
|
||||||
|
)
|
||||||
|
if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfc${v}.dll")
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFC_DIR}/mfc${v}.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfcm${v}.dll")
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFC_DIR}/mfcm${v}.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# include the language dll's as well as the actual dll's
|
||||||
|
set(MSVC_MFCLOC_DIR "${MSVC_REDIST_MFC_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.MFCLOC")
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc${v}chs.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc${v}cht.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc${v}deu.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc${v}enu.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc${v}esn.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc${v}fra.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc${v}ita.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc${v}jpn.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc${v}kor.dll"
|
||||||
|
"${MSVC_MFCLOC_DIR}/mfc${v}rus.dll"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# MSVC 8 was the first version with OpenMP
|
||||||
|
# Furthermore, there is no debug version of this
|
||||||
|
if(CMAKE_INSTALL_OPENMP_LIBRARIES AND _IRSL_HAVE_MSVC)
|
||||||
|
set(_MSOMP_DLL_VERSION ${_MSVC_DLL_VERSION})
|
||||||
|
set(_MSOMP_IDE_VERSION ${_MSVC_IDE_VERSION})
|
||||||
|
|
||||||
|
if(_MSOMP_DLL_VERSION)
|
||||||
|
set(v "${_MSOMP_DLL_VERSION}")
|
||||||
|
set(vs "${_MSOMP_IDE_VERSION}")
|
||||||
|
set(MSVC_OPENMP_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.OPENMP")
|
||||||
|
|
||||||
|
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
|
||||||
|
set(__install__libs ${__install__libs}
|
||||||
|
"${MSVC_OPENMP_DIR}/vcomp${v}.dll")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
foreach(lib
|
||||||
|
${__install__libs}
|
||||||
|
)
|
||||||
|
if(EXISTS ${lib})
|
||||||
|
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
|
||||||
|
${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib})
|
||||||
|
else()
|
||||||
|
if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
|
||||||
|
message(WARNING "system runtime library file does not exist: '${lib}'")
|
||||||
|
# This warning indicates an incomplete Visual Studio installation
|
||||||
|
# or a bug somewhere above here in this file.
|
||||||
|
# If you would like to avoid this warning, fix the real problem, or
|
||||||
|
# set CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS before including
|
||||||
|
# this file.
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(_IRSL_HAVE_Intel)
|
||||||
|
unset(__install_libs)
|
||||||
|
if(CMAKE_INSTALL_OPENMP_LIBRARIES)
|
||||||
|
if(WIN32)
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/libiomp5md.dll" "${_Intel_redistdir}/libiompstubs5md.dll")
|
||||||
|
elseif(APPLE)
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/libiomp5.dylib" "${_Intel_redistdir}/libiompstubs5.dylib")
|
||||||
|
else()
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/libiomp5.so" "${_Intel_redistdir}/libiompstubs5.so")
|
||||||
|
if(_Intel_compiler_ver VERSION_LESS 17)
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/libomp_db.so")
|
||||||
|
endif()
|
||||||
|
if(_Intel_compiler_ver VERSION_LESS 13)
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/libiompprof5.so")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
if(WIN32)
|
||||||
|
set(__install_dirs "${_Intel_redistdir}/1033")
|
||||||
|
if(EXISTS "${_Intel_redistdir}/1041")
|
||||||
|
list(APPEND __install_dirs "${_Intel_redistdir}/1041")
|
||||||
|
endif()
|
||||||
|
if(_Intel_compiler_ver VERSION_LESS 18)
|
||||||
|
list(APPEND __install_dirs "${_Intel_redistdir}/irml" "${_Intel_redistdir}/irml_c")
|
||||||
|
endif()
|
||||||
|
foreach(__Intel_lib IN ITEMS cilkrts20.dll libchkp.dll libioffload_host.dll libirngmd.dll
|
||||||
|
libmmd.dll libmmdd.dll libmpx.dll liboffload.dll svml_dispmd.dll)
|
||||||
|
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
|
||||||
|
endforeach()
|
||||||
|
if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/libgfxoffload.dll")
|
||||||
|
endif()
|
||||||
|
if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
|
||||||
|
foreach(__Intel_lib IN ITEMS ifdlg100.dll libicaf.dll libifcoremd.dll libifcoremdd.dll libifcorert.dll libifcorertd.dll libifportmd.dll)
|
||||||
|
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
elseif(APPLE)
|
||||||
|
foreach(__Intel_lib IN ITEMS libchkp.dylib libcilkrts.5.dylib libcilkrts.dylib libimf.dylib libintlc.dylib libirc.dylib libirng.dylib libsvml.dylib)
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
|
||||||
|
endforeach()
|
||||||
|
if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
|
||||||
|
if(_Intel_compiler_ver VERSION_LESS 17)
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.dylib")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
|
||||||
|
foreach(__Intel_lib IN ITEMS libifcore.dylib libifcoremt.dylib libifport.dylib libifportmt.dylib)
|
||||||
|
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
foreach(__Intel_lib IN ITEMS libchkp.so libcilkrts.so libcilkrts.so.5 libimf.so libintlc.so libintlc.so.5 libirc.so libpdbx.so libpdbx.so.5 libsvml.so)
|
||||||
|
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
|
||||||
|
endforeach()
|
||||||
|
if(_Intel_compiler_ver VERSION_GREATER_EQUAL 13)
|
||||||
|
foreach(__Intel_lib IN ITEMS libirng.so liboffload.so liboffload.so.5)
|
||||||
|
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
|
||||||
|
set(__install_dirs "${_Intel_redistdir}/irml")
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/cilk_db.so")
|
||||||
|
if(_Intel_compiler_ver VERSION_GREATER_EQUAL 15)
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.so" "${_Intel_redistdir}/libgfxoffload.so")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
if(_Intel_compiler_ver VERSION_GREATER_EQUAL 16)
|
||||||
|
foreach(__Intel_lib IN ITEMS libioffload_host.so libioffload_host.so.5 libioffload_target.so libioffload_target.so.5 libmpx.so offload_main)
|
||||||
|
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
if(_Intel_compiler_ver VERSION_LESS 15)
|
||||||
|
foreach(__Intel_lib IN ITEMS libcxaguard.so libcxaguard.so.5)
|
||||||
|
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
|
||||||
|
foreach(__Intel_lib IN ITEMS libicaf.so libifcore.so libifcore.so.5 libifcoremt.so libifcoremt.so.5 libifport.so libifport.so.5)
|
||||||
|
|
||||||
|
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
foreach(lib IN LISTS __install_libs)
|
||||||
|
if(EXISTS ${lib})
|
||||||
|
list(APPEND CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${lib})
|
||||||
|
else()
|
||||||
|
if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
|
||||||
|
message(WARNING "system runtime library file does not exist: '${lib}'")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
foreach(dir IN LISTS __install_dirs)
|
||||||
|
if(EXISTS ${dir})
|
||||||
|
list(APPEND CMAKE_INSTALL_SYSTEM_RUNTIME_DIRECTORIES ${dir})
|
||||||
|
else()
|
||||||
|
if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
|
||||||
|
message(WARNING "system runtime library file does not exist: '${dir}'")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(WATCOM)
|
||||||
|
get_filename_component( CompilerPath ${CMAKE_C_COMPILER} PATH )
|
||||||
|
if(CMAKE_C_COMPILER_VERSION)
|
||||||
|
set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
|
||||||
|
else()
|
||||||
|
set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION})
|
||||||
|
endif()
|
||||||
|
string(REGEX MATCHALL "[0-9]+" _watcom_version_list "${_compiler_version}")
|
||||||
|
list(GET _watcom_version_list 0 _watcom_major)
|
||||||
|
list(GET _watcom_version_list 1 _watcom_minor)
|
||||||
|
set( __install__libs
|
||||||
|
${CompilerPath}/clbr${_watcom_major}${_watcom_minor}.dll
|
||||||
|
${CompilerPath}/mt7r${_watcom_major}${_watcom_minor}.dll
|
||||||
|
${CompilerPath}/plbr${_watcom_major}${_watcom_minor}.dll )
|
||||||
|
foreach(lib
|
||||||
|
${__install__libs}
|
||||||
|
)
|
||||||
|
if(EXISTS ${lib})
|
||||||
|
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
|
||||||
|
${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib})
|
||||||
|
else()
|
||||||
|
if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
|
||||||
|
message(WARNING "system runtime library file does not exist: '${lib}'")
|
||||||
|
# This warning indicates an incomplete Watcom installation
|
||||||
|
# or a bug somewhere above here in this file.
|
||||||
|
# If you would like to avoid this warning, fix the real problem, or
|
||||||
|
# set CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS before including
|
||||||
|
# this file.
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
# Include system runtime libraries in the installation if any are
|
||||||
|
# specified by CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS.
|
||||||
|
if(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
|
||||||
|
if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP)
|
||||||
|
if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION)
|
||||||
|
if(WIN32)
|
||||||
|
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION bin)
|
||||||
|
else()
|
||||||
|
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION lib)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
if(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT)
|
||||||
|
set(_CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT
|
||||||
|
COMPONENT ${CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT})
|
||||||
|
endif()
|
||||||
|
install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
|
||||||
|
DESTINATION ${CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION}
|
||||||
|
${_CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT}
|
||||||
|
)
|
||||||
|
|
||||||
|
install(DIRECTORY ${CMAKE_INSTALL_SYSTEM_RUNTIME_DIRECTORIES}
|
||||||
|
DESTINATION ${CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION}
|
||||||
|
${_CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT}
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
cmake_policy(POP)
|
||||||
@@ -9,7 +9,6 @@ include(BuildVersion)
|
|||||||
include(BuildBranding)
|
include(BuildBranding)
|
||||||
include(CMakeCopyIfDifferent)
|
include(CMakeCopyIfDifferent)
|
||||||
include(DBusGlib)
|
include(DBusGlib)
|
||||||
include(FindVCRedist)
|
|
||||||
include(FMODSTUDIO)
|
include(FMODSTUDIO)
|
||||||
include(GLOD)
|
include(GLOD)
|
||||||
include(Hunspell)
|
include(Hunspell)
|
||||||
@@ -1581,29 +1580,6 @@ if (WINDOWS)
|
|||||||
|
|
||||||
add_custom_target(copy_w_viewer_manifest ALL DEPENDS ${CMAKE_CFG_INTDIR}/copy_touched.bat)
|
add_custom_target(copy_w_viewer_manifest ALL DEPENDS ${CMAKE_CFG_INTDIR}/copy_touched.bat)
|
||||||
|
|
||||||
if(EXISTS ${VISUAL_STUDIO_REDISTRIBUTABLE_PATH})
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/redist
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/redist"
|
|
||||||
DEPENDS copy_w_viewer_manifest
|
|
||||||
COMMENT "Creating redist dir"
|
|
||||||
)
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/redist/${VISUAL_STUDIO_REDISTRIBUTABLE_NAME}
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
|
||||||
ARGS
|
|
||||||
${VISUAL_STUDIO_REDISTRIBUTABLE_PATH}
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/redist/${VISUAL_STUDIO_REDISTRIBUTABLE_NAME}
|
|
||||||
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/redist
|
|
||||||
COMMENT "Copying ${VISUAL_STUDIO_REDISTRIBUTABLE_PATH} to redist dir"
|
|
||||||
)
|
|
||||||
|
|
||||||
add_custom_target(copy_w_redist ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/redist/${VISUAL_STUDIO_REDISTRIBUTABLE_NAME})
|
|
||||||
|
|
||||||
add_dependencies(${VIEWER_BINARY_NAME} copy_w_redist)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
add_dependencies(${VIEWER_BINARY_NAME} stage_third_party_libs llcommon copy_w_viewer_manifest)
|
add_dependencies(${VIEWER_BINARY_NAME} stage_third_party_libs llcommon copy_w_viewer_manifest)
|
||||||
|
|
||||||
if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
|
if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
|
||||||
|
|||||||
@@ -409,12 +409,6 @@ Section "Viewer"
|
|||||||
;This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py
|
;This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py
|
||||||
%%INSTALL_FILES%%
|
%%INSTALL_FILES%%
|
||||||
|
|
||||||
!ifdef WIN64_BIN_BUILD
|
|
||||||
ExecWait '"$INSTDIR\redist\vc_redist.x64.exe" /passive /norestart'
|
|
||||||
!else
|
|
||||||
ExecWait '"$INSTDIR\redist\vc_redist.x86.exe" /passive /norestart'
|
|
||||||
!endif
|
|
||||||
|
|
||||||
;Pass the installer's language to the client to use as a default
|
;Pass the installer's language to the client to use as a default
|
||||||
StrCpy $SHORTCUT_LANG_PARAM "--set InstallLanguage $(LanguageCode)"
|
StrCpy $SHORTCUT_LANG_PARAM "--set InstallLanguage $(LanguageCode)"
|
||||||
|
|
||||||
|
|||||||
@@ -443,13 +443,6 @@ class WindowsManifest(ViewerManifest):
|
|||||||
# Find singularity-bin.exe in the 'configuration' dir, then rename it to the result of final_exe.
|
# Find singularity-bin.exe in the 'configuration' dir, then rename it to the result of final_exe.
|
||||||
self.path(src='%s\\%s-bin.exe' % (self.args['configuration'],self.viewer_branding_id()), dst=self.final_exe())
|
self.path(src='%s\\%s-bin.exe' % (self.args['configuration'],self.viewer_branding_id()), dst=self.final_exe())
|
||||||
|
|
||||||
with self.prefix(src=os.path.join(pkgdir, "redist")):
|
|
||||||
# include the compiled launcher scripts so that it gets included in the file_list
|
|
||||||
if(self.address_size == 64):
|
|
||||||
self.path('vc_redist.x64.exe')
|
|
||||||
else:
|
|
||||||
self.path('vc_redist.x86.exe')
|
|
||||||
|
|
||||||
# Plugin host application
|
# Plugin host application
|
||||||
self.path2basename(os.path.join(os.pardir,
|
self.path2basename(os.path.join(os.pardir,
|
||||||
'llplugin', 'slplugin', self.args['configuration']),
|
'llplugin', 'slplugin', self.args['configuration']),
|
||||||
@@ -524,6 +517,17 @@ class WindowsManifest(ViewerManifest):
|
|||||||
except:
|
except:
|
||||||
print "Skipping libtcmalloc_minimal.dll"
|
print "Skipping libtcmalloc_minimal.dll"
|
||||||
|
|
||||||
|
# For msvc redist
|
||||||
|
try:
|
||||||
|
self.path('api-ms*.dll')
|
||||||
|
self.path('ucrt*.dll')
|
||||||
|
self.path('concrt*.dll')
|
||||||
|
self.path('msvc*.dll')
|
||||||
|
self.path('vcruntime*.dll')
|
||||||
|
self.path('vccor*.dll')
|
||||||
|
except:
|
||||||
|
print "Skipping msvc redist files"
|
||||||
|
|
||||||
self.path(src="licenses-win32.txt", dst="licenses.txt")
|
self.path(src="licenses-win32.txt", dst="licenses.txt")
|
||||||
self.path("featuretable.txt")
|
self.path("featuretable.txt")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user