summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'st2-env-vars-variable'Brad King2016-11-015-1/+66
|\ | | | | | | | | 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-275-1/+66
| | | | | | | | | | | | | | 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 'intel-compile-features-windows'Brad King2016-11-016-41/+60
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 369d5809 Features: Record features for Intel Compiler on Windows a5a3642f Features: Port Intel CXX features to test macros where possible d34ac22f Features: Unset Intel CXX feature temporaries 967dcf36 Intel: Remove incorrect C++98 standard compiler flag on Windows
| * | | Features: Record features for Intel Compiler on WindowsBrad King2016-10-276-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this compiler always defines `__cplusplus` to `1` we need to use `_MSC_VER`, `__INTEL_CXX11_MODE__`, and the feature test macro named `__cpp_aggregate_nsdmi` to detect C++11 and C++14 modes. With no `-Qstd=` flag this compiler defaults to C++98 plus a subset of C++11/C++14 features needed to be compatible with MSVC. We pretend it is plain C++98 and add a `-Qstd=` flag whenever needed for C++11 or above features even if they would happen to be available in MSVC-mode. Closes: #16384
| * | | Features: Port Intel CXX features to test macros where possibleBrad King2016-10-271-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | The Intel 16 and 17 compilers define feature test macros of the form `__cpp_<feature>`. Use them where possible to detect corresponding features.
| * | | Features: Unset Intel CXX feature temporariesBrad King2016-10-271-0/+10
| | | |
| * | | Intel: Remove incorrect C++98 standard compiler flag on WindowsBrad King2016-10-271-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit 05e05cd2 (Intel: Fix compiler C++98 standard flag on Windows, 2016-10-26) was wrong. The Intel C++ Compiler for Windows does not support either `-Qstd=c++98` or `-Qstd=gnu++98`. Simply remove both flags for this compiler and use no options at all to achieve this mode. Issue: #16384
* | | | 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 branch 'release'Brad King2016-10-280-0/+0
|\ \ \
| * \ \ Merge branch 'cmake-server-handshake-improvements' into releaseBrad King2016-10-284-66/+104
| |\ \ \
| * \ \ \ Merge branch 'intel-17-features' into releaseBrad King2016-10-261-3/+3
| |\ \ \ \
* | \ \ \ \ Merge topic 'cmake-server-handshake-improvements'Brad King2016-10-284-66/+104
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | 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-283-2/+35
| | | | | |
| * | | | | cmake-server: Better error reporting during handshakeTobias Hunger2016-10-272-66/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-274-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 335a29cb Enable Unicode output to Windows consoles
| * | | | | | Enable Unicode output to Windows consolesDāvis Mosāns2016-10-264-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'intel-compiler-windows-c++98'Brad King2016-10-271-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05e05cd2 Intel: Fix compiler C++98 standard flag on Windows
| * | | | | | | Intel: Fix compiler C++98 standard flag on WindowsBrad King2016-10-261-1/+5
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel C++ Compiler for Windows does not support the `-Qstd=c++98` flag but does support `-Qstd=gnu++98`. Issue: #16384
* | | | | | | Merge topic 'intel-17-features'Brad King2016-10-271-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | 554b4f90 Features: Record features for Intel C++ 17 on UNIX
| * | | | | | Features: Record features for Intel C++ 17 on UNIXBrad King2016-10-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16384
* | | | | | | 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)
| | * | | | | KWSys 2016-10-23 (b630d2f5)KWSys Upstream2016-10-251-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit b630d2f5575be7d70c214bfffc57aaf5069c6369 (master). Upstream Shortlog ----------------- Dāvis Mosāns (1): b630d2f5 ConsoleBuf: Check for actual console with GetConsoleMode
* | | | | | | Merge topic 'fix-right-angle-bracket-feature-test'Brad King2016-10-262-1/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | 68e7250a Features: Fix cxx_right_angle_brackets compiler feature test
| * | | | | | Features: Fix cxx_right_angle_brackets compiler feature testAlex Wang2016-10-252-1/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clang-format pass in commit v3.6.0-rc1~54^2~1 (Revise C++ coding style using clang-format, 2016-05-16) changed the template right angle brackets from `>>` to `> >`, which defeats the purpose of this test. Change it back and exclude this content from formatting.
* | | | | | CMake Nightly Date StampKitware Robot2016-10-261-1/+1
|/ / / / /
* | | | | Merge branch 'release'Brad King2016-10-250-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'cmake-server-message-quoting' into releaseBrad King2016-10-243-61/+61
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'intel-compile-features-windows' into releaseBrad King2016-10-242-6/+12
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'android-pic' into releaseBrad King2016-10-2415-35/+9
| |\ \ \ \
| * \ \ \ \ Merge branch 'backport-ninja-subdir-binary-dir' into releaseBrad King2016-10-248-29/+35
| |\ \ \ \ \
generated by cgit v0.12 at 2025-09-09 16:32:53 (GMT)