summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-encoding'Brad King2016-10-212-2/+19
|\ | | | | | | | | ced77d2b Ninja: Use ANSI encoding for Ninja build files on Windows
| * Ninja: Use ANSI encoding for Ninja build files on WindowsDāvis Mosāns2016-10-202-2/+19
| | | | | | | | | | Pass ANSI encoding to cmGeneratedFileStream for use with Ninja generator.
* | Merge topic 'allow-fallback-config-mapping'Brad King2016-10-215-22/+57
|\ \ | | | | | | | | | | | | | | | | | | 587ab322 Tests: Add test for MAP_IMPORTED_CONFIG_<CONFIG> empty fallback 149d49ea Teach MAP_IMPORTED_CONFIG_<CONFIG> to support configuration-less import 60d73393 Help: Format MAP_IMPORTED_CONFIG_<CONFIG> documentation
| * | Tests: Add test for MAP_IMPORTED_CONFIG_<CONFIG> empty fallbackBrad King2016-10-202-0/+10
| | |
| * | Teach MAP_IMPORTED_CONFIG_<CONFIG> to support configuration-less importJens Weggemann2016-10-203-16/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | If this property has an empty list entry, check for `IMPORTED_LOCATION` instead of `IMPORTED_LOCATION_<CONFIG>`. This allows custom imported targets to have some configurations mapped and others fall back to a default location. Closes: #16280
| * | Help: Format MAP_IMPORTED_CONFIG_<CONFIG> documentationBrad King2016-10-201-6/+7
| | |
* | | Merge topic 'ninja-diagnose-missing-tool'Brad King2016-10-2118-21/+59
|\ \ \ | | | | | | | | | | | | | | | | | | | | 010560be Ninja: Fail early on when ninja build tool does not run 2d3aa942 cmGlobalGenerator: Allow FindMakeProgram to fail
| * | | Ninja: Fail early on when ninja build tool does not runBrad King2016-10-205-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diagnose failure to run `ninja --version` and abort early. Otherwise we end up aborting with a confusing message about ninja version "" being too old. Closes: #16378
| * | | cmGlobalGenerator: Allow FindMakeProgram to failBrad King2016-10-2014-19/+35
| | |/ | |/| | | | | | | | | | Revise its signature to return `bool` so that it can fail and abort configuration early.
* | | Merge topic 'android-armeabi-c++_static'Brad King2016-10-212-5/+2
|\ \ \ | | | | | | | | | | | | | | | | 43f4326e Android: Fix support for armeabi with c++_static
| * | | Android: Fix support for armeabi with c++_staticBrad King2016-10-212-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing "unwind" and "atomic" libraries needed for this combination. See `${ndk}/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++.a` for the libraries the NDK uses. Issue: #16380
* | | | CMake Nightly Date StampKitware Robot2016-10-211-1/+1
| |/ / |/| |
* | | Merge topic 'vs-csharp-prep'Brad King2016-10-205-0/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | f27492a4 VS: Add internal API for detecting "managed" projects 4f78b9ff VS: Add CSharp project uuid and file extension
| * | | VS: Add internal API for detecting "managed" projectsMichael Stürmer2016-10-192-0/+6
| | | | | | | | | | | | | | | | | | | | This is in preparation for adding CSharp language support to the VS generator.
| * | | VS: Add CSharp project uuid and file extensionMichael Stürmer2016-10-193-0/+28
| | | | | | | | | | | | | | | | | | | | This is in preparation for adding CSharp language support to the VS generator.
* | | | Merge topic 'external-project-clone-progress'Brad King2016-10-202-3/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e89fbfaf ExternalProject: support GIT_PROGRESS argument 64aa29b7 ExternalProject: fix typo
| * | | | ExternalProject: support GIT_PROGRESS argumentBen Boeckel2016-10-182-2/+18
| | | | |
| * | | | ExternalProject: fix typoBen Boeckel2016-10-181-1/+1
| | |_|/ | |/| |
* | | | Merge topic 'external-project-configure-command-extraction'Brad King2016-10-201-20/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 63d215df ExternalProject: support extracting the configure command
| * | | | ExternalProject: support extracting the configure commandBen Boeckel2016-10-191-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the configure command generated by ExternalProject was not accessible prior to actually adding the targets. This makes the CMake configure command accessible with just a call to _ep_parse_arguments. Future work will leverage this to support custom environment settings on a per-project basis.
* | | | | Merge topic 'ninja-only-object-rules'Brad King2016-10-201-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3a9e92bc Ninja: Add compile rules only for languages that are actually compiled
| * | | | | Ninja: Add compile rules only for languages that are actually compiledBrad King2016-10-181-3/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `WriteLanguageRules` we collect all languages used for source files in a target. However, this only needs to include sources that are actually going to be compiled into object files. No object file build statements will be generated for other sources. This avoids generating language compile rules for source files that are not compiled due to being marked as `HEADER_FILE_ONLY`. Issue: #16373
* | | | | Merge topic 'clang-tidy'Brad King2016-10-2014-87/+136
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effa6c83 fix more issues reported by clang-tidy fb461cac silence selected clang-tidy violations
| * | | | | fix more issues reported by clang-tidyDaniel Pfeifer2016-10-2012-83/+131
| | | | | |
| * | | | | silence selected clang-tidy violationsDaniel Pfeifer2016-10-182-4/+5
| |/ / / /
* | | | | Merge topic 'split-cmState'Brad King2016-10-20152-2350/+2552
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6eecec7 cmListFileCache: Remove cmState header include e3587ee0 cmTargetPropertyComputer: Add missing include e0a84904 cmState: Split auxiliary classes into separate files a91eaf38 cmState: Port dependents to new cmStateTypes header 27be1d81 cmState: Move extracted declarations to a separate file 34433c88 cmState: Remove compatibility typedefs cde6eb62 cmState: Port dependent code to new cmStateSnapshot name a9bf981a cmState: Move Snapshot type to separate namespace 17d27893 cmState: Port dependent code to new cmStateDirectory name 34bcec39 cmState: Move Directory class to separate namespace 2fe3e55d cmState: Move CacheEntryType enum to separate namespace a49751fb cmState: Move TargetType enum to separate namespace 0060391d cmState: Move SnapshotType enum to separate namespace 5bc964ed cmState: Move PositionType to separate namespace 2dc40996 cmState: Move PolicyStackEntry to separate namespace cb40af5d cmState: Move SnapshotDataType to separate namespace ...
| * | | | | cmListFileCache: Remove cmState header includeStephen Kelly2016-10-1944-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include it in dependents which have previously relied on it transitively.
| * | | | | cmTargetPropertyComputer: Add missing includeStephen Kelly2016-10-191-0/+1
| | | | | |
| * | | | | cmState: Split auxiliary classes into separate filesStephen Kelly2016-10-1925-1133/+1228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port dependents to the new locations as needed. Leave behind a cmState.h include in cmListFileCache to reduce noise. It is removed in a following commit.
| * | | | | cmState: Port dependents to new cmStateTypes headerStephen Kelly2016-10-1962-61/+62
| | | | | |
| * | | | | cmState: Move extracted declarations to a separate fileStephen Kelly2016-10-192-45/+56
| | | | | |
| * | | | | cmState: Remove compatibility typedefsStephen Kelly2016-10-191-3/+0
| | | | | |
| * | | | | cmState: Port dependent code to new cmStateSnapshot nameStephen Kelly2016-10-1918-59/+54
| | | | | |
| * | | | | cmState: Move Snapshot type to separate namespaceStephen Kelly2016-10-192-172/+174
| | | | | | | | | | | | | | | | | | | | | | | | Leave behind a typedef to avoid porting dependent code in this commit.
| * | | | | cmState: Port dependent code to new cmStateDirectory nameStephen Kelly2016-10-1914-19/+19
| | | | | |
| * | | | | cmState: Move Directory class to separate namespaceStephen Kelly2016-10-192-115/+115
| | | | | | | | | | | | | | | | | | | | | | | | Leave behind a typedef to avoid porting dependent code in this commit.
| * | | | | cmState: Move CacheEntryType enum to separate namespaceStephen Kelly2016-10-1950-191/+211
| | | | | | | | | | | | | | | | | | | | | | | | Port dependent code to the change.
| * | | | | cmState: Move TargetType enum to separate namespaceStephen Kelly2016-10-1972-828/+855
| | | | | |
| * | | | | cmState: Move SnapshotType enum to separate namespaceStephen Kelly2016-10-182-31/+34
| | | | | |
| * | | | | cmState: Move PositionType to separate namespaceStephen Kelly2016-10-182-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | Remove friend declarations supporting it being a nested type.
| * | | | | cmState: Move PolicyStackEntry to separate namespaceStephen Kelly2016-10-182-11/+12
| | | | | |
| * | | | | cmState: Move SnapshotDataType to separate namespaceStephen Kelly2016-10-182-4/+5
| | | | | |
| * | | | | cmState: Move nested struct into separate top-level namespaceStephen Kelly2016-10-182-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a friend declaration to give the struct access to cmState::PositionType. This will be removed when that type is also extracted.
| * | | | | cmServerProtocol: Remove unused headerStephen Kelly2016-10-181-1/+0
| | | | | |
| * | | | | cmCommandArgumentParserHelper: Remove unused headerStephen Kelly2016-10-181-1/+0
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2016-10-201-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release'Brad King2016-10-190-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | CMake 3.7.0-rc2v3.7.0-rc2Brad King2016-10-191-1/+1
| | |/ | |/|
* | | Merge branch 'release'Brad King2016-10-190-0/+0
|\ \ \ | |/ /
| * | Merge branch 'fix-Android-NsightTegra' into releaseBrad King2016-10-183-2/+5
| |\ \