summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'fix-automoc-warnings'Brad King2018-05-152-8/+23
|\
| * Qt4Macros: Don't AUTOMOC or AUTOUIC qt4-generated filesMatthew Woehlke2018-05-152-0/+15
| * Qt4Macros: Use get_property/set_propertyMatthew Woehlke2018-05-151-8/+8
* | Merge branch 'release-3.11'Brad King2018-05-150-0/+0
|\ \
| * \ Merge branch 'custom-command-expand-empty' into release-3.11Brad King2018-05-143-0/+10
| |\ \
| * \ \ Merge branch 'autogen_register_info_files' into release-3.11Brad King2018-05-141-0/+3
| |\ \ \ | | |_|/ | |/| |
* | | | Merge topic 'autogen_register_info_files'Brad King2018-05-151-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Autogen: Register generated dependency filesSebastian Holtermann2018-05-141-0/+3
* | | | Merge topic 'custom-command-expand-empty'Brad King2018-05-153-0/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | add_custom_{command,target}: Fix crash on empty expanded commandBrad King2018-05-143-0/+10
| |/ /
* | | CMake Nightly Date StampKitware Robot2018-05-151-1/+1
* | | Merge topic 'FindPkgConfig-LINK_LIBRARIES'Brad King2018-05-144-21/+47
|\ \ \
| * | | FindPkgConfig: export the list of found libraries also as variableRolf Eike Beer2018-05-114-21/+47
* | | | Merge topic 'cuda-vs-cuda-device-runtime'Brad King2018-05-141-0/+2
|\ \ \ \
| * | | | VS: Link CUDA binaries with the device runtime library 'cudadevrt'Brad King2018-05-111-0/+2
* | | | | Merge branch 'release-3.11'Brad King2018-05-140-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'irsl-fortran-only-linux' into release-3.11Brad King2018-05-111-8/+10
| |\ \ \ \
* | \ \ \ \ Merge topic 'irsl-fortran-only-linux'Brad King2018-05-141-8/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | IRSL: Fix Intel library list for ifort-only setupsChristian Pfeiffer2018-05-111-8/+10
| | |_|_|/ | |/| | |
* | | | | Merge topic 'update-kwsys'Brad King2018-05-144-15/+30
|\ \ \ \ \
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-05-114-15/+30
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | KWSys 2018-05-11 (46da6b14)KWSys Upstream2018-05-114-15/+30
* | | | | | Merge topic 'xml-element-enhance'Brad King2018-05-143-61/+57
|\ \ \ \ \ \
| * | | | | | cmCTestLaunch: use cmXMLElement for XML generationVitaly Stakhovsky2018-05-113-61/+57
* | | | | | | Merge topic 'findjpeg_static_fix'Brad King2018-05-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | FindJPEG: Add 'jpeg-static' to searched namesMichael Hofmann2018-05-111-1/+1
* | | | | | | | Merge topic 'cpack-nuget'Brad King2018-05-1416-32/+860
|\ \ \ \ \ \ \ \
| * | | | | | | | CPack: Add NuGet supportAlex Turbov2018-05-1116-6/+835
| * | | | | | | | Tests: Format `RunCPackVerifyResult.cmake` more consistentlyAlex Turbov2018-05-091-24/+24
| * | | | | | | | Tests: Fix comment for finding dpkg toolAlex Turbov2018-05-091-2/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-141-1/+1
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-131-1/+1
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-121-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'vs-refactor'Brad King2018-05-112-110/+92
|\ \ \ \ \ \ \
| * | | | | | | cmVisualStudio10TargetGenerator: refactorVitaly Stakhovsky2018-05-092-110/+92
* | | | | | | | Merge topic 'FindCUDA-sccache'Brad King2018-05-111-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | FindCUDA: Add support for sccacheWill Feng2018-05-091-4/+4
* | | | | | | | | Merge topic 'vs-fix-csharp-recompile'Brad King2018-05-111-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | VS: When not referencing output assembly do not try to copy it eitherAndreas Schönle2018-05-091-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'release-3.11'Brad King2018-05-110-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'restore-imported-lib-alias-diagnostic' into release-3.11Brad King2018-05-103-2/+25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'FindBoost-backport-python-deps' into release-3.11Brad King2018-05-091-34/+34
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'restore-imported-lib-alias-diagnostic'Brad King2018-05-113-2/+25
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | add_library: Restore error on alias of non-global imported targetBrad King2018-05-103-2/+25
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'FindBoost-backport-python-deps'Brad King2018-05-111-34/+34
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | FindBoost: Backport versioned python dependencies for v1.35 to v1.66Filip Matzner2018-05-091-20/+20
| * | | | | | | | FindBoost: Remove extra indentation in 1.65/1.66 dependency blockBrad King2018-05-081-16/+16
| |/ / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-111-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'ctest-start-args-rework'Craig Scott2018-05-1035-53/+312
|\ \ \ \ \ \ \
| * | | | | | | Help: add release notes for ctest_start() changesKyle Edwards2018-05-091-0/+7