summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'doc-cmake-server-typos' into releaseBrad King2016-10-211-81/+48
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'android-link-exe' into releaseBrad King2016-10-214-0/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'android-armeabi-c++_static' into releaseBrad King2016-10-212-5/+2
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ 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 'intel-compile-features-windows'Brad King2016-10-252-6/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 881585f9 Intel: Fix compiler extension flags on Windows
| * | | | | | | | | | Intel: Fix compiler extension flags on WindowsBrad King2016-10-242-6/+12
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extension flags enabled by commit v3.6.0-rc1~120^2~1 (Features: Record standard flags for Intel C/C++ on Windows, 2016-04-18) of the form `-Qstd=gnu++11` are not supported by the Intel C/C++ Compiler for Windows. Fall back to using the non-extension form of the flags. Issue: #16384
* | | | | | | | | | 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 'android-pic'Brad King2016-10-2515-35/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c272adb Android: Link position-independent executables with proper flags 6205f179 Android: Set CMAKE_POSITION_INDEPENDENT_CODE automatically
| * | | | | | | | | | Android: Link position-independent executables with proper flagsBrad King2016-10-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `-fPIE -pie` to the default executable link flags when `CMAKE_POSITION_INDEPENDENT_CODE` is enabled. This is required by Android 16 and above for executables to run on the device. Closes: #16382
| * | | | | | | | | | Android: Set CMAKE_POSITION_INDEPENDENT_CODE automaticallyBrad King2016-10-2415-35/+5
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the toolchain file or cache does not set this, enable it automatically based on the Android API version. Versions 16 and above expect position independent code. Use the main `CMAKE_POSITION_INDEPENDENT_CODE` setting in favor of hard-coding `-fpic` or `-fPIC` in the compiler flags for each ABI. This allows CMake to use `-fpie` or `-fPIE` as needed when sources are meant for executables, and `-fpic` or `-fPIC` for other sources.
* | | | | | | | | | Merge topic 'ninja-subdir-binary-dir'Brad King2016-10-258-29/+35
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-ninja-subdir-binary-dir' into ninja-subdir-binary-dirBrad King2016-10-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | Ninja: Use binary dir for `$subdir/all` targetsAlexis Murzeau2016-10-248-29/+35
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
generated by cgit v0.12 at 2025-01-24 03:58:18 (GMT)