summaryrefslogtreecommitdiffstats
path: root/Modules/InstallRequiredSystemLibraries.cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'backport-3.21-vs2022' into vs2022Brad King2021-10-141-1/+1
|\
| * IRSL: Fix discovery of VS 2022 v143 toolset redistributables for preview 5Brad King2021-10-141-1/+1
| | | | | | | | | | | | | | VS 2022 Preview 5 renamed the redist directories from `Microsoft.VC142.*` to `Microsoft.VC143.*` in order to match the `v143` toolset name. Fixes: #22586
* | IRSL: Fix search for Windows redist files with Intel Classic compilerBrad King2021-09-231-0/+4
| | | | | | | | | | | | | | | | The oneAPI icx/ifx compilers are under `.../windows/bin`. The classic icl/ifort compilers are under `.../windows/bin/intel64`. Add paths to the redist directory relative to both locations. Fixes: #22673
* | Merge topic 'vs2022'Brad King2021-09-031-2/+6
|\ \ | |/ | | | | | | | | | | | | 38c8f2c4e3 IRSL: Add discovery of VS 2022 v143 toolset redistributables f01ea7e391 MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6497
| * IRSL: Add discovery of VS 2022 v143 toolset redistributablesBrad King2021-09-021-2/+6
| | | | | | | | Fixes: #22586
* | IRSL: Avoid duplication of Intel redist lib folder pathsAlexander Grund2021-08-021-9/+24
| |
* | IRSL: Fix check of path to Intel redistdirAlexander Grund2021-08-021-1/+1
|/ | | | | | Fix a cut-n-paste error from commit fd4406f33e (IRSL: Add Intel compiler support, 2017-08-16, v3.10.0-rc1~187^2). Make the checked and used paths match.
* IRSL: Add Intel oneAPI redist location on WindowsBrad King2021-06-081-1/+3
| | | | Fixes: #22283
* IRSL: Add support for IntelLLVMWilliam R. Dieter2021-01-281-7/+7
| | | | | | Use the same code paths as the `Intel` compiler id. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* IRSL: Add support for non-x86/x64 architectures such as arm64pastdue2021-01-251-7/+9
| | | | | | Implement `CMAKE_MSVC_ARCH` determination for more architectures. Fixes: #16734
* Merge topic 'irsl-msvcp_atomic_wait_dll'Brad King2021-01-181-0/+2
|\ | | | | | | | | | | | | 6718caaa2f IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5702
| * IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRTKelly Walker2021-01-151-0/+2
| | | | | | | | | | | | | | VS now distributes these additional runtime libraries. Install them if available. Fixes: #21675
* | Help: Add `.. versionadded` directives to module docsNikita Nemkin2020-12-021-4/+12
|/ | | | Issue: #19715
* IRSL: Fix path to Intel 32-bit redist librariesTorgeir Rusten2020-07-091-1/+1
| | | | | | The path to the 32 bit libraries in the Intel windows/redist folder use ia32. I don't remember if this has changed at some point, but ia32 has been used at least since Intel Fortran XE 2018.
* IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if availableBrad King2020-01-201-6/+20
| | | | | | | VS now distributes these additional runtime libraries. Install them if available. Fixes: #20228
* IRSL: Install vcruntime140_1.dll if availableBrad King2019-10-111-0/+6
| | | | | | | VS 2019 now distributes this additional runtime DLL with its `14.2x` toolsets. Fixes: #19829
* IRSL: Prefer MSVC runtime libraries from newest toolset firstBrad King2019-10-111-0/+1
|
* IRSL: Fix discovery of VS 2019 v141 toolset redistributablesJames Butler2019-07-221-4/+12
| | | | | | | | Since VS 2019, the v141 toolset redistributables can be found in either the VS 2019 or VS 2017 install directory. Update the logic to search multiple versions of VS. Fixes: #19488
* IRSL: Fix typo in v143 toolset version checkJames Butler2019-07-221-2/+2
| | | | | | Fix the toolset v143 check from commit 33ee779330 (IRSL: Fix discovery of VS 2019 v142 toolset redistributables, 2019-04-03, v3.14.2~6^2) to check the correct variable.
* IRSL: Update redist directory for VS 2019 update 1Brad King2019-04-151-2/+5
| | | | | | | | VS 2019 Update 1 will fix its redist directories to be named `VC142` instead of `VC141`. It will also use cl `19.21` instead of `19.20` so we can use that to distinguish the versions. Fixes: #19131
* IRSL: Fix discovery of VS 2019 v142 toolset redistributablesBrad King2019-04-041-9/+14
| | | | | | | | | Since VS 2017's v141 toolset there is no longer a simple equation to calculate the redist name, dll version, and VS IDE version from just the MSVC toolset version. Refactor the logic to use hard-coded values and warn when a new version is not supported. Fixes: #19125
* Merge topic 'irsl-ucrt-version'Brad King2018-11-201-3/+19
|\ | | | | | | | | | | | | 01c7d9ce86 IRSL: Detect versioned Windows Universal CRT directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2637
| * IRSL: Detect versioned Windows Universal CRT directoriesBrad King2018-11-191-3/+19
| | | | | | | | | | | | | | Windows SDK version 10.0.17763.0 now places the uCRT libraries in a versioned directory. Fixes: #18603
* | Help: Convert remaining modules to block-style commentsKitware Robot2018-10-221-54/+55
|/
* Fix misc. typosluz.paz2018-10-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found via `codespell -q 3 -I ../cmake-whitelist.txt --skip="./Utilities"` where the whitelist consists of ``` aci ans behaviour buil convertor dum earch ect emmited emmitted helpfull iff isnt ith lowercased mose nd nknown nto objext ot pathes pevents splitted substract superceded supercedes te tim todays uint upto whitespaces ```
* Merge topic 'irsl-fortran-only-linux'Brad King2018-05-141-8/+10
|\ | | | | | | | | | | | | 05ece372a6 IRSL: Fix Intel library list for ifort-only setups Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2061
| * IRSL: Fix Intel library list for ifort-only setupsChristian Pfeiffer2018-05-111-8/+10
| | | | | | | | Fixes: #17727
* | Merge topic 'InstallRequiredSystemLibraries-mfcm'Brad King2018-04-191-0/+8
|\ \ | | | | | | | | | | | | | | | | | | bdf660cab5 InstallRequiredSystemLibraries: Check for existence of mfcm dlls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1980
| * | InstallRequiredSystemLibraries: Check for existence of mfcm dllsChristof Krüger2018-04-181-0/+8
| |/ | | | | | | | | | | | | | | | | Previously, only existence of `mfc${v}.dll` and `mfc${v}d.dll` variants was checked and it was assumed that the managed variants `mfcm*.dll` also existed. This assumption doesn't hold with Visual Studio 2017. Check each file separately. Fixes: #17913
* | Modules: Use MSVC_TOOLSET_VERSION variable to simplify logicArkady Shapkin2018-04-041-75/+30
|/
* Merge topic 'irsl-intel-fortran-only-fix'Brad King2017-12-141-5/+8
|\ | | | | | | | | | | | | 7d1ed84c IRSL: Skip libgfxoffload if no Intel C++ is used Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1589
| * IRSL: Skip libgfxoffload if no Intel C++ is usedChristian Pfeiffer2017-12-121-5/+8
| | | | | | | | | | | | | | `libgfxoffload` is only used and installed by the Intel C/C++ compilers and will be unavailable if only Intel Fortran has been installed. Fixes: #17550
* | Merge topic 'irsl-msvc-omp-fix'Brad King2017-12-131-2/+7
|\ \ | |/ |/| | | | | | | | | 4dae55fb IRSL: Fix MSVC variable deferencing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1588
| * IRSL: Fix MSVC variable deferencingChristian Pfeiffer2017-12-121-2/+7
| | | | | | | | Fixes: #17529
* | IRSL: Install the 1041 folder for Intel compilersChristian Pfeiffer2017-11-201-1/+4
|/ | | | | | | | | The presence of the `1041` seems to solely depend on whether a given Intel compiler release was available in Japanese or not. Install it if it is present and silently ignore it otherwise. Example: The Intel 2018.0 release did not ship it, but the 2018.1 compilers have it.
* IRSL: Add support for the 2018 release on Windows.Christian Pfeiffer2017-11-061-3/+5
| | | | Fixes: #17421
* Merge branch 'backport-irsl-vs15-future' into irsl-vs15-futureBrad King2017-09-061-19/+16
|\
| * InstallRequiredSystemLibraries: Add support for future VS 2017 toolchainsBrad King2017-09-061-19/+16
| | | | | | | | | | | | Assume that all cl 19.xx versions will use the same runtime DLL pattern. Suggested-by: Tomasz Słodkowicz <slodki@users.noreply.github.com>
* | IRSL: Add Intel compiler supportChristian Pfeiffer2017-08-301-2/+133
| | | | | | | | | | Fixes: #16891 Fixes: #9903
* | IRSL: Install VC++ OpenMP libraries only for MSVCChristian Pfeiffer2017-08-231-1/+8
|/ | | | | | At the moment, the Visual C++ OpenMP libraries will be installed for all compilers simulating MSVC. They should however only be provided if we're dealing with actual MSVC.
* InstallRequiredSystemLibraries: Find VS 2017 Update 3 redist directoryBrad King2017-08-211-3/+13
| | | | | | Add compiler version 19.11 to our table. Fixes: #17184
* InstallRequiredSystemLibraries: Factor redist name into variableBrad King2017-08-211-8/+18
| | | | | | Store the `VC###` component of the `Microsoft.VC###.CRT` directory name in a variable set based on the toolchain version. Its naming convention is changed by VS 15.3.
* VS: Add an environment variable for the Windows 10 kits directoryBrad King2017-04-121-0/+6
| | | | | | | | | | | | | | | | | Define a `CMAKE_WINDOWS_KITS_10_DIR` environment variable to allow users to tell CMake about a custom Windows 10 SDK directory. We choose to make this an environment variable rather than a CMake variable or cache entry because: * Using a custom directory also requires custom external MSBuild configuration. Therefore users are already configuring a custom environment. * The custom directory must be set consistently in all parts of a build including nested projects. An environment variable avoids requiring users to thread the setting into nested builds. Fixes: #16743
* InstallRequiredSystemLibraries: Find VS 2017 redist directoryBrad King2017-03-271-0/+5
| | | | | | | | Use our undocumented `cmake_host_system_information` query to find the VS 2017 installation directory by asking the VS installer tool. Then look relative to that for the redist directory. Fixes: #16737
* InstallRequiredSystemLibraries: Split VS 2017 search pathsBrad King2017-03-271-7/+14
| | | | | | VS 2017 does not have the same registry entries or other paths we search for other VS versions. Split the search code paths to treat it separately.
* InstallRequiredSystemLibraries: Add support for VS 2017Brad King2017-03-231-5/+23
| | | | | | | | | | | | | | | VS 2017 (VS 15) places its redist DLLs in `Microsoft.VC150.*` directories but still uses version number `140` in the DLL names. The redist directories now have version numbers in their name, and the MSVC and MFC runtime DLLs may be in directories with different versions. Fill out our logic to handle this. For now assume we are given the `MSVC_REDIST_DIR` value as a cache entry. Unfortunately we cannot yet find the VS 2017 MSVC redist directory automatically since there is no registry entry for the VS installation. Later we will have to use `cmVSSetupHelper` for this. Issue: #16735
* InstallRequiredSystemLibraries: Split MFC redist dir variableBrad King2017-03-231-3/+5
|
* InstallRequiredSystemLibraries: Split VS IDE and DLL versionsBrad King2017-03-231-66/+86
| | | | Refactor MSVC logic to split the IDE and DLL version variables.
* InstallRequiredSystemLibraries: Drop version from variable namesBrad King2017-03-221-122/+123
| | | | | | Each `MSVC${v}_*_DIR` variable is only ever used with one value for `${v}` within a given build tree. Drop the `${v}` version component from the variable names.
* InstallRequiredSystemLibraries: Refactor to avoid macrosBrad King2017-03-221-58/+54
| | | | | | For a given `MSVC_VERSION` our macros were each called at most once. Replace them with a single code path that is parameterized over what was the macro argument.