summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'support_CMAKE_VFS_OVERLAY_for_rc_compilation'Brad King2020-12-151-4/+16
|\
| * llvm-rc: Add CMAKE_VFS_OVERLAY to the preprocessing flagsThomas Bernard2020-12-141-4/+16
* | Merge branch 'release-3.18'Brad King2020-12-150-0/+0
|\ \
| * \ Merge branch 'backport-ninja-no-cleandead' into release-3.18Brad King2020-12-142-15/+1
| |\ \
* | \ \ Merge branch 'release-3.17'Brad King2020-12-150-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'backport-ninja-no-cleandead' into release-3.17Brad King2020-12-142-15/+1
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge branch 'release-3.19'Brad King2020-12-150-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'ninja-no-cleandead' into release-3.19Brad King2020-12-152-15/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'ninja-no-cleandead'Brad King2020-12-152-15/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'backport-ninja-no-cleandead' into ninja-no-cleandeadBrad King2020-12-142-15/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | Ninja: Remove cleandead on regenerationBrad King2020-12-142-15/+1
* | | | | | Merge branch 'release-3.19'Brad King2020-12-150-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'rel-macos-apple-silicon' into release-3.19Brad King2020-12-153-1/+22
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'rel-macos-apple-silicon'Brad King2020-12-153-1/+22
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Utilities/Release: Update macOS Qt 5.9 build for platform versioningBrad King2020-12-143-1/+22
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'release-3.19'Craig Scott2020-12-150-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'CMakePackageConfigHelpers-version-range' into release-3.19Craig Scott2020-12-154-47/+160
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Merge topic 'CMakePackageConfigHelpers-version-range'Craig Scott2020-12-154-46/+159
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'backport-3.19-CMakePackageConfigHelpers-version-range' into CMa...Craig Scott2020-12-140-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | CMakePackageConfigHelpers: Relax restrictions on version rangeMarc Chevrier2020-12-144-47/+160
| | |/ / / /
| * | | | | CMakePackageConfigHelpers: Relax restrictions on version rangeMarc Chevrier2020-12-144-46/+159
* | | | | | CMake Nightly Date StampKitware Robot2020-12-151-1/+1
|/ / / / /
* | | | | Merge topic 'FindMatlab-MCR'Brad King2020-12-141-32/+53
|\ \ \ \ \
| * | | | | FindMatlab: Fix search for MCRNikolaj Fogh2020-12-111-29/+47
| * | | | | FindMatlab: Only include engine and dataarray libraries if they are foundNikolaj Fogh2020-12-111-3/+6
* | | | | | Merge topic 'custom-command-output-genex'Brad King2020-12-1430-179/+614
|\ \ \ \ \ \
| * | | | | | add_custom_{command,target}: Add genex support to OUTPUT and BYPRODUCTSBrad King2020-12-1127-107/+367
| * | | | | | cmLocalGenerator: Evaluate generator expressions in custom command outputsBrad King2020-12-112-4/+101
| * | | | | | cmLocalGenerator: Simplify custom command output cmSourceFile creationBrad King2020-12-102-43/+39
| * | | | | | cmLocalGenerator: Factor out helper to expand custom command output pathsBrad King2020-12-103-5/+15
| * | | | | | cmLocalGenerator: Refactor UpdateOutputToSourceMap to avoid boolean trapBrad King2020-12-102-12/+17
| * | | | | | cmLocalGenerator: Re-order logic in CreateGeneratedSourceBrad King2020-12-101-8/+9
| * | | | | | cmCustomCommandGenerator: Treat relative outputs w.r.t. build dirBrad King2020-12-101-11/+28
| * | | | | | cmCustomCommandGenerator: Refactor OUTPUT and DEPENDS path evaluationBrad King2020-12-101-17/+20
| * | | | | | cmCustomCommandGenerator: Evaluate generator expressions in outputsBrad King2020-12-102-1/+3
| * | | | | | cmAddCustom{Command,Target}Command: Skip conversions on genex pathsBrad King2020-12-102-3/+9
| * | | | | | Help: Add examples to add_custom_command reference documentationBrad King2020-12-101-0/+38
* | | | | | | Merge topic 'doc-try_compile-typos'Brad King2020-12-143-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Help: Fix small typos in documentationGuillem Vela2020-12-143-3/+3
* | | | | | | | Merge topic 'makefiles-compiler-deps-optims'Brad King2020-12-141-79/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | cmDependsCompiler: rely now on cmGccDepfileReader for depfile parserMarc Chevrier2020-12-111-79/+14
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'automoc-autouic-autorcc-not-csharp'Brad King2020-12-141-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Autogen: Avoid processing CSharp targetsAlessandro Ambrosano2020-12-111-0/+7
| |/ / / / / / /
* | | | | | | | Merge topic 'update-curl'Brad King2020-12-14328-3684/+4813
|\ \ \ \ \ \ \ \
| * | | | | | | | curl: Set build options the way we need for CMakeBrad King2020-12-111-1/+3
| * | | | | | | | Merge branch 'upstream-curl' into update-curlBrad King2020-12-09327-3682/+4809
| |\ \ \ \ \ \ \ \
| | * | | | | | | | curl 2020-12-09 (e0528597)Curl Upstream2020-12-09327-3684/+4809
| * | | | | | | | | curl: Update script to get curl 7.74.0Brad King2020-12-091-1/+1
* | | | | | | | | | Merge branch 'release-3.19'Brad King2020-12-140-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'FindGLUT-macos-tbd' into release-3.19Brad King2020-12-141-2/+10
| |\ \ \ \ \ \ \ \ \