summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2018-07-111-1/+1
* Merge branch 'release-3.12'Brad King2018-07-100-0/+0
|\
| * Merge branch 'document_object_library_as_a_property_type' into release-3.12Brad King2018-07-101-2/+2
| |\
* | \ Merge topic 'document_object_library_as_a_property_type'Brad King2018-07-101-2/+2
|\ \ \ | | |/ | |/|
| * | Help: Add OBJECT_LIBRARY to TYPE target property documentationRobert Maynard2018-07-101-2/+2
| |/
* | Merge topic 'skip_mfc_test'Brad King2018-07-101-0/+4
|\ \
| * | Tests: skip MFC test when building cmake when no file association for vcprojFred Baksik2018-07-091-0/+4
* | | Merge topic 'uwp'Brad King2018-07-108-0/+8
|\ \ \
| * | | Add WindowsPhone and WindowsStore platform modules for Clang/GNU C/CXXMartin Storsjö2018-07-078-0/+8
* | | | Merge topic 'vs-deployment-files'Brad King2018-07-104-29/+70
|\ \ \ \
| * | | | Help: Add documentation for DEPLOYMENT_ADDITIONAL_FILESFrank Goyens2018-07-093-0/+26
| * | | | VS: extended OutputDeploymentDebuggerTool for AdditionalFilesFrank Goyens2018-07-091-18/+32
| * | | | VS: moved EscapeForXML function higher up and made staticFrank Goyens2018-07-061-11/+12
* | | | | CMake Nightly Date StampKitware Robot2018-07-101-1/+1
* | | | | Merge topic 'emacs-fix-unescaped-character-literals'Brad King2018-07-091-1/+1
|\ \ \ \ \
| * | | | | cmake-mode.el: Fix "unescaped character literals" warningJeff Kowalski2018-07-091-1/+1
* | | | | | Merge topic 'option-normal-variable'Brad King2018-07-0913-24/+116
|\ \ \ \ \ \
| * | | | | | option: respect existing normal variableRobert Maynard2018-07-0915-28/+115
| * | | | | | Option: Add a test that verifies interaction with normal variablesRobert Maynard2018-06-212-0/+17
| * | | | | | cmOption: Remove VTK 4.0 workaroundsRobert Maynard2018-06-211-13/+1
* | | | | | | Merge branch 'release-3.12'Brad King2018-07-090-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | CMake 3.12.0-rc3v3.12.0-rc3Brad King2018-07-091-1/+1
* | | | | | | Merge branch 'release-3.12'Brad King2018-07-090-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'csharp-link-file' into release-3.12Brad King2018-07-091-4/+7
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'csharp-link-file'Brad King2018-07-091-4/+7
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | VS: Only link cs files when they're not in binary dirRobert Dailey2018-07-061-4/+7
* | | | | | | | CMake Nightly Date StampKitware Robot2018-07-091-1/+1
* | | | | | | | CMake Nightly Date StampKitware Robot2018-07-081-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-07-071-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'vsnasm-quoting'Brad King2018-07-065-6/+30
|\ \ \ \ \ \
| * | | | | | VS: Properly quote arguments in nasm.xmlDavid Benjamin2018-07-025-6/+30
* | | | | | | Merge topic 'FindCURL-per-config'Brad King2018-07-062-13/+50
|\ \ \ \ \ \ \
| * | | | | | | FindCURL: Find debug and release variants separatelyHiroshi Miura2018-07-032-13/+48
| * | | | | | | FindCURL: Improve CURL::libcurl property code layoutHiroshi Miura2018-07-031-2/+4
* | | | | | | | Merge topic 'list-command-insert'Brad King2018-07-064-6/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | list: Allow inserting at the end of a listDaniel Chabrowski2018-07-054-6/+8
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-07-061-1/+1
* | | | | | | | | Merge branch 'release-3.12'Brad King2018-07-050-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'doc-add_compile_definitions' into release-3.12Brad King2018-07-051-3/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'revert-subdirectory-linking' into release-3.12Brad King2018-07-0318-107/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'FindLua-CMP0012' into release-3.12Brad King2018-07-031-0/+5
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-UseSWIG-legacy-targets' into release-3.12Brad King2018-07-035-53/+115
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge topic 'doc-add_compile_definitions'Brad King2018-07-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Help: fix add_compile_definitions() documentationMarc Chevrier2018-07-051-3/+3
* | | | | | | | | | | | Merge topic 'UseSWIG-legacy-targets'Brad King2018-07-056-55/+118
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-UseSWIG-legacy-targets' into UseSWIG-legacy-targetsBrad King2018-07-036-55/+118
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | UseSWIG: reintroduce legacy target name managementMarc Chevrier2018-07-035-53/+115
| | |/ / / / / / / / / /
* | | | | | | | | | | | Merge topic 'FindLua-CMP0012'Brad King2018-07-051-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | FindLua: Set CMP0012 to NEW for the revised search codeAdriaan de Groot2018-07-031-0/+5
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'gitignore-vscode'Brad King2018-07-051-0/+3
|\ \ \ \ \ \ \ \ \ \ \