summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-3.11'Brad King2018-02-200-0/+0
|\
| * Merge branch 'ti-depfile-flag-fix' into release-3.11Brad King2018-02-201-1/+1
| |\
| * \ Merge branch 'help_fixup' into release-3.11Brad King2018-02-162-2/+2
| |\ \
* | \ \ Merge topic 'ti-depfile-flag-fix'Brad King2018-02-201-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Compiler/TI: Fix depfile generation for C++Grzegorz Dobinski2018-02-201-1/+1
* | | | Merge topic 'string-join'Brad King2018-02-2012-2/+75
|\ \ \ \
| * | | | string: Add JOIN subcommandAlex Turbov2018-02-1612-2/+75
* | | | | Merge topic 'ninja-cmake-deps'Brad King2018-02-201-1/+7
|\ \ \ \ \
| * | | | | Ninja: Don't add custom command outputs to phony rule for CMake inputsPatrick Stewart2018-02-151-1/+7
* | | | | | Merge topic 'msvc-parallel-build-17696'Brad King2018-02-201-0/+23
|\ \ \ \ \ \
| * | | | | | CMake: Enable /MP for MSVC toolchainRobert Dailey2018-02-151-0/+23
* | | | | | | Merge topic 'findzlib-folder-priority'Brad King2018-02-201-2/+2
|\ \ \ \ \ \ \
| * | | | | | | FindZLIB: Search names per directoryStefan Hacker2018-02-151-2/+2
| |/ / / / / /
* | | | | | | Merge topic 'CheckCSourceRuns-log-run-output'Brad King2018-02-201-3/+8
|\ \ \ \ \ \ \
| * | | | | | | CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run outputEdward Z. Yang2018-02-161-3/+8
* | | | | | | | Merge topic 'follow-up-misc-typos'Brad King2018-02-209-9/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Maint: misc. typosluz.paz2018-02-169-9/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'help_fixup'Brad King2018-02-202-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Help: Fix command references in CMAKE_NETRC* variable documentationShane Parris2018-02-162-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-02-201-1/+1
* | | | | | | CMake Nightly Date StampKitware Robot2018-02-191-1/+1
* | | | | | | CMake Nightly Date StampKitware Robot2018-02-181-1/+1
* | | | | | | CMake Nightly Date StampKitware Robot2018-02-171-1/+1
* | | | | | | Merge topic 'file_cmd_touch'Brad King2018-02-1618-9/+102
|\ \ \ \ \ \ \
| * | | | | | | Replaces execute_process calls to touch files with file(TOUCH) callsShane Parris2018-02-153-7/+4
| * | | | | | | Adds file(TOUCH) and file(TOUCH_NOCREATE) sub-commandsShane Parris2018-02-1515-2/+98
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'genex-IN_LIST-operator'Brad King2018-02-165-0/+43
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Genex: Add IN_LIST logical operatorMarc Chevrier2018-02-075-0/+43
* | | | | | | CMake Nightly Date StampKitware Robot2018-02-161-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'enhanced-UseSWIG-Module'Brad King2018-02-1523-214/+596
|\ \ \ \ \ \
| * | | | | | UseSWIG: modernize moduleMarc Chevrier2018-02-1410-156/+489
| * | | | | | UseSWIG: Re-work test frameworkMarc Chevrier2018-02-1418-70/+119
* | | | | | | Merge topic 'directory-property-TESTS'Brad King2018-02-157-1/+48
|\ \ \ \ \ \ \
| * | | | | | | Tests management: add TESTS directory propertyMarc Chevrier2018-02-087-1/+48
* | | | | | | | Merge branch 'release-3.11'Brad King2018-02-150-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'export-android-mk' into release-3.11v3.11.0-rc1Brad King2018-02-152-13/+17
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'export-android-mk'Brad King2018-02-152-13/+17
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Android.mk: Fix export of static libraries with PRIVATE dependenciesBrad King2018-02-142-3/+6
| * | | | | | | Android.mk: Evaluate generator expressions up frontBrad King2018-02-141-12/+13
| | |_|_|_|/ / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-02-151-1/+1
* | | | | | | Merge topic 'ninja-cmd'Brad King2018-02-147-9/+121
|\ \ \ \ \ \ \
| * | | | | | | Ninja: Generate scripts for long custom command sequencesRoger Leigh2018-02-067-9/+121
* | | | | | | | Merge topic 'help_string_MAKE_C_IDENTIFIER'Brad King2018-02-142-8/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Help: Expand string(MAKE_C_IDENTIFIER) docsCraig Scott2018-02-112-8/+14
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge topic 'const-members'Brad King2018-02-142-66/+40
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | cmVisualStudio10TargetGenerator: Make some data members const; simplifyVitaly Stakhovsky2018-02-062-66/+40
* | | | | | | | CMake Nightly Date StampKitware Robot2018-02-141-1/+1
* | | | | | | | Merge topic 'more-misc-typos'Brad King2018-02-139-16/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | MAINT: Misc. typosluz.paz2018-02-139-16/+16
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'release-3.11'Brad King2018-02-130-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |