summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'doc-prefer-MSVC_VERSION' into releaseBrad King2017-03-2211-3/+25
|\
| * Help: Document preference of `MSVC_VERSION` over `MSVC##`Brad King2017-03-2210-0/+20
| * Help: Clarify MSVC14 docs w.r.t. VS 2017 v141 toolsetBrad King2017-03-221-2/+2
| * MSVC: Exclude future cl 20+ from MSVC14 variableBrad King2017-03-221-1/+3
* | Merge branch 'FindwxWidgets-vs-2017' into releaseBrad King2017-03-221-5/+7
|\ \
| * | FindwxWidgets: Add support for VS 2017 v141 toolsetBrad King2017-03-221-1/+3
| * | FindwxWidgets: Use `MSVC_VERSION` instead of `MSVC##`Brad King2017-03-221-5/+5
* | | Merge branch 'FindBoost-1.64' into releaseBrad King2017-03-221-1/+1
|\ \ \
| * | | FindBoost: Update support for 1.64Mateusz Łoskot2017-03-221-1/+1
* | | | Merge branch '16624-blas-lapack-documentation' into releaseBrad King2017-03-222-9/+35
|\ \ \ \
| * | | | FindBLAS/LAPACK: Format documentationGregor Jasny2017-03-222-9/+35
| | |/ / | |/| |
* | | | Merge branch 'ninja-fortran-depfile-fix' into releaseBrad King2017-03-211-1/+3
|\ \ \ \
| * | | | Ninja: Fix Fortran `include` dependency on generated fileBrad King2017-03-211-1/+3
| |/ / /
* | | | Merge branch 'backport-FindHDF5-optional-no-config' into releaseBrad King2017-03-211-2/+6
|\ \ \ \
| * | | | FindHDF5: Add option to skip finding package configuration fileBrad King2017-03-211-1/+4
| * | | | FindHDF5: Improve HDF5_ROOT variable documentationBrad King2017-03-211-1/+2
| |/ / /
* | | | Merge branch 'cuda_no_ninja_response_support' into releaseBrad King2017-03-212-9/+12
|\ \ \ \
| * | | | CUDA: Disable support for using response files.Robert Maynard2017-03-212-9/+12
| |/ / /
* | | | Merge branch 'libarchive-backport-rc4-crypto-rec' into releaseBrad King2017-03-211-1/+1
|\ \ \ \
| * | | | libarchive: backport rc4 crypto requirement updateBrad King2017-03-211-1/+1
| |/ / /
* | | | Merge branch 'cpack-rpm-debuginfo-multiple-files-fix' into releaseBrad King2017-03-211-2/+8
|\ \ \ \
| * | | | CPack/RPM: fix cpack_rpm_debugsymbol_check parameterDomen Vrankar2017-03-211-2/+8
| |/ / /
* | | | Merge branch 'FindHDF5-fix-quoting' into releaseBrad King2017-03-201-1/+1
|\ \ \ \
| * | | | FindHDF5: fix quotingBen Boeckel2017-03-151-1/+1
* | | | | Merge branch 'FindBoost-1.64' into releaseBrad King2017-03-201-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | FindBoost: Add support for 1.64Mateusz Łoskot2017-03-201-3/+3
| | |/ / | |/| |
* | | | Merge branch 'CSharpUtilities-doc' into releaseBrad King2017-03-201-12/+20
|\ \ \ \
| * | | | CSharpUtilities: Fix documentationMichael Stürmer2017-03-201-12/+20
| |/ / /
* | | | Merge branch 'doc-toolset-host-arch-typo' into releaseBrad King2017-03-131-1/+1
|\ \ \ \
| * | | | Help: Fix typo in CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTUREBrad King2017-03-131-1/+1
| |/ / /
* | | | Merge branch 'FindGit-avoid-vs-2017-git' into releaseBrad King2017-03-101-1/+15
|\ \ \ \
| * | | | FindGit: Avoid finding VS 2017 non-general Git installationBrad King2017-03-101-1/+15
| |/ / /
* | | | Merge branch 'doc-vs15-MSVC_VERSION' into releaseBrad King2017-03-081-1/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Help: Update MSVC_VERSION for Visual Studio 2017Wojciech Mamrak2017-03-081-1/+2
| |/ /
* | | Merge branch 'fix_csharp_custom_targets' into releaseBrad King2017-03-071-0/+4
|\ \ \
| * | | VS: Do not treat custom targets as CSharp targetsMichael Stürmer2017-03-071-0/+4
| |/ /
* | | Merge branch 'revert-CTestTestfile-removal' into releaseBrad King2017-03-061-7/+4
|\ \ \
| * | | Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF"Brad King2017-03-061-7/+4
| |/ /
* | | Merge branch 'FindVulkan-fix-win-32' into releaseBrad King2017-03-061-0/+1
|\ \ \ | |_|/ |/| |
| * | FindVulkan: Fix for SDK versions < 1.0.42 on 32-bit WindowsMatthäus G. Chajdas2017-03-061-0/+1
* | | Merge branch 'FindHDF5-fix-definitions' into releaseBrad King2017-03-061-1/+1
|\ \ \ | |_|/ |/| |
| * | FindHDF5: Restore `-D` in HDF5_DEFINITIONSKris Thielemans2017-03-061-1/+1
|/ /
* | CMake 3.8.0-rc2v3.8.0-rc2Brad King2017-03-031-1/+1
* | Merge branch 'FindJNI-archlinux-jvm-paths' into releaseBrad King2017-03-031-0/+5
|\ \
| * | FindJNI: Add jvm paths for Arch LinuxKitsu2017-03-031-0/+5
* | | Merge branch 'FindVulkan-update' into releaseBrad King2017-03-021-2/+6
|\ \ \ | | |/ | |/|
| * | FindVulkan: Update for LunarG SDK import library location on WindowsBrad Davis2017-03-021-2/+6
| |/
* | Merge branch 'implicit-dir-symlinks' into releaseBrad King2017-03-0211-7/+91
|\ \
| * | Tests: Add case for RPATH exclusion of symlinks to implicit directoriesBrad King2017-03-029-0/+74
| * | Merge branch 'backport-implicit-dir-symlinks' into implicit-dir-symlinksBrad King2017-03-022-7/+17
| |\ \ | | |/ | |/|