summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ | | |/ | |/|
| | * cmOrderDirectories: Consider symlinks when checking implicit directoriesBrad King2017-03-021-2/+7
| | * cmOrderDirectories: Factor out implicit directory checkBrad King2017-03-012-6/+11
* | | Merge branch 'csproj_add_free_source_tags' into releaseBrad King2017-03-0212-56/+410
|\ \ \
| * | | VS: add test for VS_CSHARP_* source file propertyMichael Stürmer2017-03-014-0/+38
| * | | VS: add CSharpUtilities moduleMichael Stürmer2017-03-014-0/+305
| * | | VS: add VS_CSHARP_<tagname> sourcefile propertyMichael Stürmer2017-03-015-56/+67
| |/ /
* | | Merge branch 'find-libarch-not-symlink' into releaseBrad King2017-02-284-16/+77
|\ \ \
| * | | find_library: Skip 'lib => lib<arch>' searches if one symlinks the otherBrad King2017-02-284-0/+51
| * | | cmFindLibraryCommand: Refactor AddArchitecturePath logicBrad King2017-02-281-16/+26
| | |/ | |/|
* | | Merge branch 'kwiml-test-gcc-format-security' into releaseBrad King2017-02-271-1/+1
|\ \ \
| * | | KWIML: Add -Wno-format-security to tolerate -Werror=format-securityOrion Poplawski2017-02-271-1/+1
| | |/ | |/|
* | | Merge branch 'ExternalProject-checkout-clarify' into releaseBrad King2017-02-241-1/+1
|\ \ \
| * | | ExternalProject: Run `git checkout` with `--` to clarify argumentsBrad King2017-02-241-1/+1
| |/ /
* | | Merge branch 'object-library-compile-pdb' into releaseBrad King2017-02-242-1/+2
|\ \ \
| * | | Fix COMPILE_PDB_NAME when used on an OBJECT libraryBrad King2017-02-242-1/+2
| |/ /
* | | Merge branch 'ninja-no-full-path' into releaseBrad King2017-02-241-4/+3
|\ \ \
| * | | Revert "Ninja: Use full path for all source files"Brad King2017-02-241-4/+3
| * | | Merge branch 'fix-ctest_update-svn' into release-3.7Brad King2017-02-151-1/+4
| |\ \ \ | | |_|/ | |/| |
* | | | Merge branch 'vcxproj-indentation' into releaseBrad King2017-02-231-0/+1
|\ \ \ \
| * | | | VS: Fix .vcxproj indentationBrad King2017-02-231-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'clang-format-attrs' into releaseBrad King2017-02-229-44/+60
|\ \ \ \
| * | | | clang-format.bash: Use Git attributes to mark files for formattingBrad King2017-02-229-32/+27
| * | | | Define a custom Git attribute to mark sources using our C styleBrad King2017-02-221-5/+15
| * | | | Define a custom Git attribute to mark source files as generatedBrad King2017-02-222-10/+21
* | | | | Merge branch 'doc-cmake-language-makefile-vars' into releaseBrad King2017-02-221-0/+6
|\ \ \ \ \
| * | | | | Help: Clarify 'make-style' variable references in cmake-language(7)Michael Maltese2017-02-221-0/+6
| | |/ / / | |/| | |
* | | | | Merge branch 'FindCUDA-fix-init' into releaseBrad King2017-02-221-0/+1
|\ \ \ \ \
| * | | | | FindCUDA: Fix PTX selection with multiple architecturesBjoern Thiel2017-02-221-0/+1
| |/ / / /