Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cpack-rpm-correct-error-message-debug-lengths' into release | Brad King | 2017-03-23 | 1 | -2/+2 |
|\ | |||||
| * | CPack/RPM: fix error message associated with source path length | Daniel Black | 2017-03-23 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'InstallRequiredSystemLibraries-vs2017' into release | Brad King | 2017-03-23 | 1 | -69/+109 |
|\ \ | |||||
| * | | InstallRequiredSystemLibraries: Add support for VS 2017 | Brad King | 2017-03-23 | 1 | -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 variable | Brad King | 2017-03-23 | 1 | -3/+5 |
| | | | |||||
| * | | InstallRequiredSystemLibraries: Split VS IDE and DLL versions | Brad King | 2017-03-23 | 1 | -66/+86 |
| | | | | | | | | | | | | Refactor MSVC logic to split the IDE and DLL version variables. | ||||
* | | | Merge branch 'InstallRequiredSystemLibraries-refactor' into release | Brad King | 2017-03-23 | 1 | -179/+176 |
|\ \ \ | |/ / | |||||
| * | | InstallRequiredSystemLibraries: Drop version from variable names | Brad King | 2017-03-22 | 1 | -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 macros | Brad King | 2017-03-22 | 1 | -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. | ||||
| * | | InstallRequiredSystemLibraries: Use `MSVC_VERSION` instead of `MSVC##` | Brad King | 2017-03-22 | 1 | -22/+22 |
| |/ | | | | | | | Issue: #16735 | ||||
* | | Merge branch 'avoid-MSVC-per-version-vars' into release | Brad King | 2017-03-23 | 3 | -11/+11 |
|\ \ | |||||
| * | | FindRuby: Use `MSVC_VERSION` instead of `MSVC##` | Brad King | 2017-03-23 | 1 | -5/+5 |
| | | | |||||
| * | | FindGTK2: Use `MSVC_VERSION` instead of `MSVC##` | Brad King | 2017-03-23 | 1 | -5/+5 |
| | | | |||||
| * | | FindBoost: Avoid mentioning discouraged `MSVC##`` variable | Brad King | 2017-03-23 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'doc-prefer-MSVC_VERSION' into release | Brad King | 2017-03-22 | 1 | -1/+3 |
|\ \ | |||||
| * | | MSVC: Exclude future cl 20+ from MSVC14 variable | Brad King | 2017-03-22 | 1 | -1/+3 |
| |/ | |||||
* | | Merge branch 'FindwxWidgets-vs-2017' into release | Brad King | 2017-03-22 | 1 | -5/+7 |
|\ \ | |||||
| * | | FindwxWidgets: Add support for VS 2017 v141 toolset | Brad King | 2017-03-22 | 1 | -1/+3 |
| | | | | | | | | | | | | Issue: #16735 | ||||
| * | | FindwxWidgets: Use `MSVC_VERSION` instead of `MSVC##` | Brad King | 2017-03-22 | 1 | -5/+5 |
| |/ | |||||
* | | Merge branch 'FindBoost-1.64' into release | Brad King | 2017-03-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | FindBoost: Update support for 1.64 | Mateusz Łoskot | 2017-03-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Update the Boost library name mangling used for VS 2017 to match a change made to Boost upstream (vc1410 => vc141). | ||||
* | | | Merge branch '16624-blas-lapack-documentation' into release | Brad King | 2017-03-22 | 2 | -9/+35 |
|\ \ \ | |||||
| * | | | FindBLAS/LAPACK: Format documentation | Gregor Jasny | 2017-03-22 | 2 | -9/+35 |
| | |/ | |/| | | | | | | | Closes #16624 | ||||
* | | | Merge branch 'backport-FindHDF5-optional-no-config' into release | Brad King | 2017-03-21 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | FindHDF5: Add option to skip finding package configuration file | Brad King | 2017-03-21 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some projects may not be prepared to use the imported targets defined by the HDF5 package configuration file. Give users a way to skip this part of the search. Issue: #16718 | ||||
| * | | | FindHDF5: Improve HDF5_ROOT variable documentation | Brad King | 2017-03-21 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge branch 'cpack-rpm-debuginfo-multiple-files-fix' into release | Brad King | 2017-03-21 | 1 | -2/+8 |
|\ \ \ | |||||
| * | | | CPack/RPM: fix cpack_rpm_debugsymbol_check parameter | Domen Vrankar | 2017-03-21 | 1 | -2/+8 |
| |/ / | | | | | | | | | | | | | | | | | | | `CPACK_RPM_INSTALL_FILES` must be converted into a list before it is used as parameter to `cpack_rpm_debugsymbol_check`. Fixes: #16717 | ||||
* | | | Merge branch 'FindHDF5-fix-quoting' into release | Brad King | 2017-03-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | FindHDF5: fix quoting | Ben Boeckel | 2017-03-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'FindBoost-1.64' into release | Brad King | 2017-03-20 | 1 | -3/+3 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | FindBoost: Add support for 1.64 | Mateusz Łoskot | 2017-03-20 | 1 | -3/+3 |
| | |/ | |/| | | | | | | | | | | | | | Update the module to enable finding components of Boost 1.64 (beta) from the upcoming release. Also update the Boost library name mangling used for VS 2017 to match a change made to Boost upstream (vc150 => vc1410). | ||||
* | | | Merge branch 'CSharpUtilities-doc' into release | Brad King | 2017-03-20 | 1 | -12/+20 |
|\ \ \ | |||||
| * | | | CSharpUtilities: Fix documentation | Michael Stürmer | 2017-03-20 | 1 | -12/+20 |
| |/ / | | | | | | | | | | Fixes: #16711 | ||||
* | | | Merge branch 'FindGit-avoid-vs-2017-git' into release | Brad King | 2017-03-10 | 1 | -1/+15 |
|\ \ \ | |||||
| * | | | FindGit: Avoid finding VS 2017 non-general Git installation | Brad King | 2017-03-10 | 1 | -1/+15 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At a VS 2017 command prompt the `PATH` contains a directory that happens to have a `Git/cmd/git.exe` inside it. However, this executable is not meant for general use. Revise our use of `Git/` path suffixes to be more specific to its original purpose of searching in the typical `c:/Program Files*/Git/` installation directories. Avoid using the suffixes on `PATH` entries. Fixes: #16706 | ||||
* | | | Merge branch 'FindVulkan-fix-win-32' into release | Brad King | 2017-03-06 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | FindVulkan: Fix for SDK versions < 1.0.42 on 32-bit Windows | Matthäus G. Chajdas | 2017-03-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before Vulkan 1.0.42, the SDK would add the Bin directory to `PATH`, which was confusing the 32-bit search on Windows. Avoid such confusion by ignoring the `PATH` when looking for the 32-bit version. Vulkan 1.0.42 fixed the whole problem by moving the libraries into Lib, Lib32, so this is strictly a compatibility fix for old SDKs. | ||||
* | | | FindHDF5: Restore `-D` in HDF5_DEFINITIONS | Kris Thielemans | 2017-03-06 | 1 | -1/+1 |
| |/ |/| | | | | | | | | | | | | | Changes in commit v3.8.0-rc1~7^2~5 (FindHDF5: Fix command-line parsing argument extraction order, 2017-02-02) accidentally dropped `-D` from preprocessor definition flags extracted from the HDF5 compiler wrappers. Fixes: #16693 | ||||
* | | Merge branch 'FindJNI-archlinux-jvm-paths' into release | Brad King | 2017-03-03 | 1 | -0/+5 |
|\ \ | |||||
| * | | FindJNI: Add jvm paths for Arch Linux | Kitsu | 2017-03-03 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch 'FindVulkan-update' into release | Brad King | 2017-03-02 | 1 | -2/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | FindVulkan: Update for LunarG SDK import library location on Windows | Brad Davis | 2017-03-02 | 1 | -2/+6 |
| |/ | | | | | | | | | | | As of at least 1.0.42 of the LunarG SDK, the `vulkan-1.lib` import library on Windows is stored in `${VULKAN_SDK}/Lib` or `${VULKAN_SDK}/Lib32`. | ||||
* | | Merge branch 'csproj_add_free_source_tags' into release | Brad King | 2017-03-02 | 1 | -0/+298 |
|\ \ | |||||
| * | | VS: add CSharpUtilities module | Michael Stürmer | 2017-03-01 | 1 | -0/+298 |
| |/ | |||||
* | | Merge branch 'ExternalProject-checkout-clarify' into release | Brad King | 2017-02-24 | 1 | -1/+1 |
|\ \ | |||||
| * | | ExternalProject: Run `git checkout` with `--` to clarify arguments | Brad King | 2017-02-24 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | Fix the case when the tag name to be checked out also happens to match a path name. Fixes: #16678 | ||||
* | | Merge branch 'FindCUDA-fix-init' into release | Brad King | 2017-02-22 | 1 | -0/+1 |
|\ \ | |||||
| * | | FindCUDA: Fix PTX selection with multiple architectures | Bjoern Thiel | 2017-02-22 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'ExternalProject-update-docs' into release | Brad King | 2017-02-21 | 1 | -2/+9 |
|\ \ |