summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2016-11-051-1/+1
|
* Merge topic 'vs-flag-order'Brad King2016-11-041-2/+3
|\ | | | | | | | | 4cb5d335 VS: Place source-specific AdditionalOptions after target-wide flags
| * VS: Place source-specific AdditionalOptions after target-wide flagsBrad King2016-11-021-2/+3
| | | | | | | | | | | | | | | | | | | | Flags specified in the `COMPILE_FLAGS` source-file property should be placed after those in target-wide properties so that those on individual source files can override those on the whole target. This is already done by most generators but was not implemented correctly for VS 2010 and above. Closes: #16400
* | CMake Nightly Date StampKitware Robot2016-11-041-1/+1
| |
* | Merge topic 'remove-utf8-option'Brad King2016-11-037-57/+6
|\ \ | | | | | | | | | | | | baead1e2 Encoding: Remove option to use ANSI code page internally
| * | Encoding: Remove option to use ANSI code page internallyClinton Stimpson2016-11-027-57/+6
| | | | | | | | | | | | | | | | | | The switch to use UTF-8 encoding has been defaulted to on for quite some time since commit v3.2.0-rc1~116^2 (Encoding: Switch to use UTF-8 internally by default on Windows, 2014-12-26).
* | | Merge topic 'compile-features-for-language-standards'Brad King2016-11-031-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a8d758c Help: Document language standard meta-features df252db1 Features: Test cycle diagnostic with language standard meta-feature 6d5fb0e0 Features: Test feature propagation with language standard meta-feature a34b98a8 WCDH: Ignore language standard meta-features b0996a3f Features: Add meta-features requesting awareness of a particular standard 8b6cc251 Features: Centralize per-compiler recording macros 2d23f7b2 Features: Do not record features on MSVC < 2010
| * | | Features: Add meta-features requesting awareness of a particular standardBrad King2016-11-021-0/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | A common use case of `target_compile_features` is simply to specify that the compiler should be run in a mode that is aware of e.g. C++11. Some projects simply specify a particular C++11-only feature to request this. Provide a first-class way to do this by naming features after the corresponding language standard. Record them as always available in the corresponding standard level so that requesting them always ensures that standard (or higher) is used.
* | | CMake Nightly Date StampKitware Robot2016-11-031-1/+1
|/ /
* | Merge topic 'fix_compiler_arg1'Brad King2016-11-021-1/+1
|\ \ | | | | | | | | | | | | cfbf857b cmRulePlaceholderExpander: Fix CMAKE_<LANG>_COMPILER_ARG1 replacement
| * | cmRulePlaceholderExpander: Fix CMAKE_<LANG>_COMPILER_ARG1 replacementZack Galbreath2016-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | Refactoring in commit b29425f7 (cmLocalGenerator: Populate a container of mappings for replacements, 2016-10-09) broke substitution of this placeholder by storing the wrong key in the new replacement map. Use the proper key, `CMAKE_<LANG>_COMPILER_ARG1`.
* | | CMake Nightly Date StampKitware Robot2016-11-021-1/+1
| |/ |/|
* | Merge topic 'custom-command-CROSSCOMPILING_EMULATOR'Brad King2016-11-012-14/+35
|\ \ | | | | | | | | | | | | | | | f648b9be Tests: Check that CROSSCOMPILING_EMULATOR is not used on imported targets e7480d67 Fix custom command target substitution with CROSSCOMPILING_EMULATOR
| * | Fix custom command target substitution with CROSSCOMPILING_EMULATORBrad King2016-10-282-14/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~88^2 (CustomCommandGenerator: Add support for CROSSCOMPILING_EMULATOR, 2016-05-04) logic was introduced to substitute a target's `CROSSCOMPILING_EMULATOR` for argv0 in a custom command. However, it broke the case when the argv0 was a target name and now fails to expand the target name to its location at the same time as inserting the emulator. Fix the latter case. Inspired-by: Brian Maher <brian@brimworks.com> Closes: #16288
* | | Merge topic 'src-COMPILE_FLAGS-genex'Brad King2016-11-017-15/+65
|\ \ \ | | | | | | | | | | | | | | | | | | | | 9a58517d Tests: Add case for Xcode per-config per-source COMPILE_FLAGS diagnostic 1e4bb358 Add generator expression support to per-source COMPILE_FLAGS
| * | | Add generator expression support to per-source COMPILE_FLAGSZsolt Parragi2016-10-287-15/+65
| |/ / | | | | | | | | | | | | | | | This allows users to specify different genex-based compile flags for each file in a target, e.g. compiling just a single file with `Od/Ox` in release builds on Visual Studio.
* | | Merge topic 'st2-env-vars-variable'Brad King2016-11-012-1/+34
|\ \ \ | | | | | | | | | | | | | | | | 95805d72 Sublime: Add option to specify env vars for the .sublime-project
| * | | Sublime: Add option to specify env vars for the .sublime-projectBruno Pedrosa2016-10-272-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS` variable to control addition of env vars in the `.sublime-project`. Closes: #16387
* | | | Merge topic 'clang-tidy'Brad King2016-11-0120-48/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5214bb35 Avoid some copies 602b78aa Remove redundant c_str() calls c58c739d Use the empty method to check for emptiness
| * | | | Avoid some copiesDaniel Pfeifer2016-10-305-16/+16
| | | | |
| * | | | Remove redundant c_str() callsDaniel Pfeifer2016-10-3014-29/+26
| | | | |
| * | | | Use the empty method to check for emptinessDaniel Pfeifer2016-10-302-3/+4
| | | | |
* | | | | Merge topic 'ninja-windows-POST_BUILD-noop'Brad King2016-11-014-7/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 353f6362 Ninja: Fix POST_BUILD noop on Windows
| * | | | | Ninja: Fix POST_BUILD noop on WindowsBrad King2016-10-284-7/+11
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Use `cd .` instead of `:` in a Windows shell. Closes: #16393
* | | | | CMake Nightly Date StampKitware Robot2016-11-011-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2016-10-311-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2016-10-301-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-10-291-1/+1
|/ /
* | 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
| |/ /