summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: Fix POST_BUILD noop on WindowsBrad King2016-10-284-7/+11
| | | | | | Use `cd .` instead of `:` in a Windows shell. Closes: #16393
* Merge topic 'cmake-server-handshake-improvements'Brad King2016-10-282-63/+99
|\ | | | | | | | | | | 42ccbee1 server-mode: Handle generator toolset and platform in handshake d792491c cmake-server: Better error reporting during handshake
| * server-mode: Handle generator toolset and platform in handshakeTobias Hunger2016-10-282-1/+32
| |
| * cmake-server: Better error reporting during handshakeTobias Hunger2016-10-271-64/+69
| | | | | | | | | | | | | | Catch more problematic input during handshake and report failure. These were caught before when trying to configure, but it is way better to get these reports early.
* | CMake Nightly Date StampKitware Robot2016-10-281-1/+1
| |
* | Merge topic 'include-what-you-use'Brad King2016-10-27163-107/+962
|\ \ | | | | | | | | | | | | e81c323d Include necessary headers in commands
| * | Include necessary headers in commandsDaniel Pfeifer2016-10-26163-107/+962
| | |
* | | Merge topic 'consoleBuf'Brad King2016-10-273-0/+24
|\ \ \ | | | | | | | | | | | | | | | | 335a29cb Enable Unicode output to Windows consoles
| * | | Enable Unicode output to Windows consolesDāvis Mosāns2016-10-263-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Use KWSys ConsoleBuf to replace the `streambuf` on `std::cout` and `std::cerr` so that process output can be encoded correctly for display in a Windows console.
* | | | Merge topic 'vs-fix-no-toolset'Brad King2016-10-271-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0caca40f VS: Fix use of `Windows7.1SDK` 64-bit toolset with VS 2010 Express
| * | | | VS: Fix use of `Windows7.1SDK` 64-bit toolset with VS 2010 ExpressBrad King2016-10-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 584ab528 (VS: Add internal API to get platform toolset as string, 2016-10-18) accidentally changed the semantics of the original `cmGlobalVisualStudio10Generator::GetPlatformToolset` implementation to return a pointer to an empty string instead of `nullptr` when no toolset is configured. This broke cases that tested for `nullptr` to detect the lack of any specific toolset, such as the call in `Find64BitTools`. Restore the `nullptr` return in this case.
* | | | | CMake Nightly Date StampKitware Robot2016-10-271-1/+1
| |/ / / |/| | |
* | | | Merge topic 'vs-toolset-options'Brad King2016-10-2611-132/+293
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69fc7bf8 VS: Choose flag map based on the toolset name e2ed9a70 VS: Move toolset flag table lookup to global generator 584ab528 VS: Add internal API to get platform toolset as string
| * | | | VS: Choose flag map based on the toolset nameDon Olmstead2016-10-255-5/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSBuild interprets the `.vcxproj` content based on the `PlatformToolset` setting, so our reverse mapping needs to be based on that setting too. For VS 2010 and above, choose the flag map to match the toolset name rather than the generator VS version. Issue: #16153
| * | | | VS: Move toolset flag table lookup to global generatorDon Olmstead2016-10-258-129/+96
| |/ / / | | | | | | | | | | | | | | | | Move `Get*FlagTable` methods to the global generator and have each VS generator version pre-populate its default flag table.
| * | | VS: Add internal API to get platform toolset as stringBrad King2016-10-252-3/+11
| |/ /
* | | Merge topic 'update-kwsys'Brad King2016-10-261-4/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | 51cfba8c Merge branch 'upstream-KWSys' into update-kwsys 53862f04 KWSys 2016-10-23 (b630d2f5)
| * | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-10-251-4/+12
| |/ / | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-10-23 (b630d2f5)
* | | CMake Nightly Date StampKitware Robot2016-10-261-1/+1
|/ /
* | Merge topic 'cm_unordered_set'Brad King2016-10-254-49/+51
|\ \ | | | | | | | | | | | | c15dc197 Introduce CM_UNORDERED_SET
| * | Introduce CM_UNORDERED_SETDaniel Pfeifer2016-10-244-49/+51
| | | | | | | | | | | | | | | Avoid duplicating switch among std::unordered_set, cmsys::hash_set, and std::set.
* | | Merge topic 'remove-cmobject'Brad King2016-10-2577-152/+3
|\ \ \ | | | | | | | | | | | | | | | | 15aa814b Remove cmObject.h and cmTypeMacro.h
| * | | Remove cmObject.h and cmTypeMacro.hDaniel Pfeifer2016-10-2477-152/+3
| |/ /
* | | Merge topic 'st2-fix-regex'Brad King2016-10-251-1/+3
|\ \ \ | | | | | | | | | | | | | | | | 9f1429e2 Sublime: Update generated diagnostic matching expression for MSVC
| * | | Sublime: Update generated diagnostic matching expression for MSVCBruno Pedrosa2016-10-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the generated `file_regex` to match MSVC-style messages in addition to the GCC-style messages already matched. Use non-capturing sub-patterns to tolerate the differences in message formats while still capturing the four pieces of information in proper group numbers (file name, line number, column number, message). Closes: #16375
* | | | Merge topic 'ninja-subdir-binary-dir'Brad King2016-10-252-29/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87cc9bfc Merge branch 'backport-ninja-subdir-binary-dir' into ninja-subdir-binary-dir e983bd32 Ninja: Use binary dir for `$subdir/all` targets 42db2ebc Ninja: Use binary dir for `$subdir/all` targets
| * | | | Ninja: Use binary dir for `$subdir/all` targetsAlexis Murzeau2016-10-242-29/+16
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The targets added by commit v3.6.0-rc1~240^2~2 (Ninja: Add `$subdir/all` targets, 2016-03-11) use as `$subdir` the relative path from the top of the source tree to the current source directory. This is not correct when using `add_subdirectory(test test_bin)`. Instead we need to use the relative path from the top of the binary tree to the current binary directory as was done for related targets by commit v3.7.0-rc1~268^2 (Ninja: Add `$subdir/{test,install,package}` targets, 2016-08-05).
* | | | Merge topic 'cmake-server-message-quoting'Brad King2016-10-251-2/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | 9b8dc79c cmake-server: Change message wrapper to avoid ambiguity with content
| * | | cmake-server: Change message wrapper to avoid ambiguity with contentBrad King2016-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change our message wrapper from [== CMake Server ==[ ... ]== CMake Server ==] to [== "CMake Server" ==[ ... ]== "CMake Server" ==] to guarantee that no JSON content can ever contain the ending string (because it would be encoded as `]== \"CMake Server\" ==]`).
| * | | Merge branch 'cmake-server-pipe-mode-fix' into releaseBrad King2016-10-181-6/+5
| |\ \ \
| * \ \ \ Merge branch 'ninja-framework-POST_BUILD' into releaseBrad King2016-10-131-2/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into releaseBrad King2016-10-133-6/+6
| |\ \ \ \ \
| | * | | | | Honor LINK_WHAT_YOU_USE when set to OFFJamie Snape2016-10-133-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly setting variable CMAKE_LINK_WHAT_YOU_USE or property LINK_WHAT_YOU_USE to OFF should not cause LWYU to run. Fix the property lookup to use GetPropertyAsBool.
| * | | | | | Merge branch 'ninja-rc-regression' into releaseBrad King2016-10-131-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cmake-gui-fix-extra-generator-names' into releaseBrad King2016-10-111-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'vs15-separate-flag-table' into releaseBrad King2016-10-103-3/+247
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'update-kwsys' into releaseBrad King2016-10-081-11/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'android-export-has-cpp' into releaseBrad King2016-10-071-0/+12
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'codelite-global-setting' into releaseBrad King2016-10-073-3/+24
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-VS-resources-pri-path' into releaseBrad King2016-10-051-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'qtifw-https-cmake.org' into releaseBrad King2016-10-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-10-251-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Remove cmCommand::Enabled and all related accessorsDaniel Pfeifer2016-10-242-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled is never set to false. Remove the member variable and all related getters and setters.
* | | | | | | | | | | | | | Merge topic 'remove-cmobject-uses'Brad King2016-10-24144-291/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2214011f Make cmCPackGenerator not inherit from cmObject 7f9a8d53 Make cmCPackGeneratorFactory not inherit from cmObject fb0b087c Make cmCTestGenericHandler not inherit from cmObject 2169b0fa Make cmCPackLog not inherit from cmObject 9855ebf1 Make cmCommand not inherit from cmObject
| * | | | | | | | | | | | | | Make cmCPackGenerator not inherit from cmObjectDaniel Pfeifer2016-10-222-5/+6
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make cmCPackGeneratorFactory not inherit from cmObjectDaniel Pfeifer2016-10-221-4/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make cmCTestGenericHandler not inherit from cmObjectDaniel Pfeifer2016-10-2211-12/+12
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make cmCPackLog not inherit from cmObjectDaniel Pfeifer2016-10-221-4/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make cmCommand not inherit from cmObjectDaniel Pfeifer2016-10-22129-266/+13
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge topic 'separate-compilation'Brad King2016-10-24120-350/+1092
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 569509f4 Fix newly discovered clang-tidy issues 6c9b3b5c cmCommand: implement functions in cxx file 8483dab8 bootstrap: Sort source files lexicographically 4fb70919 Create all commands from a single function 608afd4f Separate compilation for commands included in cmBootstrapCommands2 64f9c282 Separate compilation for commands included in cmBootstrapCommands1 f69e768d Separate compilation for commands included in cmCommands