summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Ninja: Fix POST_BUILD noop on WindowsBrad King2016-10-284-7/+11
* 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
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
* | | | CMake Nightly Date StampKitware Robot2016-10-281-1/+1
* | | | Merge topic 'include-what-you-use'Brad King2016-10-27163-107/+962
|\ \ \ \
| * | | | Include necessary headers in commandsDaniel Pfeifer2016-10-26163-107/+962
* | | | | Merge topic 'consoleBuf'Brad King2016-10-274-0/+25
|\ \ \ \ \
| * | | | | Enable Unicode output to Windows consolesDāvis Mosāns2016-10-264-0/+25
* | | | | | Merge topic 'intel-compiler-windows-c++98'Brad King2016-10-271-1/+5
|\ \ \ \ \ \
| * | | | | | Intel: Fix compiler C++98 standard flag on WindowsBrad King2016-10-261-1/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'intel-17-features'Brad King2016-10-271-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Features: Record features for Intel C++ 17 on UNIXBrad King2016-10-261-3/+3
* | | | | | Merge topic 'vs-fix-no-toolset'Brad King2016-10-271-1/+5
|\ \ \ \ \ \
| * | | | | | VS: Fix use of `Windows7.1SDK` 64-bit toolset with VS 2010 ExpressBrad King2016-10-271-1/+5
* | | | | | | CMake Nightly Date StampKitware Robot2016-10-271-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'vs-toolset-options'Brad King2016-10-2611-132/+293
|\ \ \ \ \ \
| * | | | | | VS: Choose flag map based on the toolset nameDon Olmstead2016-10-255-5/+191
| * | | | | | VS: Move toolset flag table lookup to global generatorDon Olmstead2016-10-258-129/+96
| |/ / / / /
| * | | | | 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
|\ \ \ \ \
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-10-251-4/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | KWSys 2016-10-23 (b630d2f5)KWSys Upstream2016-10-251-4/+12
* | | | | | Merge topic 'fix-right-angle-bracket-feature-test'Brad King2016-10-262-1/+4
|\ \ \ \ \ \
| * | | | | | Features: Fix cxx_right_angle_brackets compiler feature testAlex Wang2016-10-252-1/+4
| |/ / / / /
* | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Introduce CM_UNORDERED_SETDaniel Pfeifer2016-10-244-49/+51
* | | | | | | | | | | Merge topic 'remove-cmobject'Brad King2016-10-2577-152/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove cmObject.h and cmTypeMacro.hDaniel Pfeifer2016-10-2477-152/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'intel-compile-features-windows'Brad King2016-10-252-6/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Intel: Fix compiler extension flags on WindowsBrad King2016-10-242-6/+12
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'st2-fix-regex'Brad King2016-10-251-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Sublime: Update generated diagnostic matching expression for MSVCBruno Pedrosa2016-10-241-1/+3
* | | | | | | | | | | Merge topic 'android-pic'Brad King2016-10-2515-35/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Android: Link position-independent executables with proper flagsBrad King2016-10-241-0/+4
| * | | | | | | | | | Android: Set CMAKE_POSITION_INDEPENDENT_CODE automaticallyBrad King2016-10-2415-35/+5
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'ninja-subdir-binary-dir'Brad King2016-10-258-29/+35
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-ninja-subdir-binary-dir' into ninja-subdir-binary-dirBrad King2016-10-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |