summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'fix-macos-sysroot' into releaseBrad King2016-11-022-30/+2
|\ \ \ \
| * | | | Darwin: Remove deployment target version checkGregor Jasny2016-11-012-26/+0
| * | | | Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path"Gregor Jasny2016-11-011-4/+2
| |/ / /
* | | | Merge branch 'FindMatlab-fix-typo' into releaseBrad King2016-10-282-3/+3
|\ \ \ \
| * | | | FindMatlab: Fix typo in matlab_add_unit_test implementationMatthew Woehlke2016-10-282-3/+3
| |/ / /
* | | | Merge branch 'FindMatlab-9.1' into releaseBrad King2016-10-281-0/+1
|\ \ \ \
| * | | | FindMatlab: Add support for Matlab 2016b (9.1)Francesco Romano2016-10-281-0/+1
| |/ / /
* | | | Merge branch 'cmake-server-handshake-improvements' into releaseBrad 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
* | | | | Merge branch 'intel-17-features' into releaseBrad King2016-10-261-3/+3
|\ \ \ \ \
| * | | | | Features: Record features for Intel C++ 17 on UNIXBrad King2016-10-261-3/+3
* | | | | | Merge branch 'cmake-server-message-quoting' into releaseBrad King2016-10-243-61/+61
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | cmake-server: Change message wrapper to avoid ambiguity with contentBrad King2016-10-243-61/+61
* | | | | | Merge branch 'intel-compile-features-windows' into releaseBrad King2016-10-242-6/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Intel: Fix compiler extension flags on WindowsBrad King2016-10-242-6/+12
| | |/ / / | |/| | |
* | | | | Merge branch 'android-pic' into releaseBrad King2016-10-2415-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 branch 'backport-ninja-subdir-binary-dir' into releaseBrad King2016-10-248-29/+35
|\ \ \ \ \ \
| * | | | | | Ninja: Use binary dir for `$subdir/all` targetsAlexis Murzeau2016-10-248-29/+35
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'doc-cmake-server-typos' into releaseBrad King2016-10-211-81/+48
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Help: Fix cmake-server documentationTobias Hunger2016-10-211-81/+48
* | | | | | Merge branch 'android-link-exe' into releaseBrad King2016-10-214-0/+16
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Android: Add missing link flags for device executablesBrad King2016-10-214-0/+16
* | | | | | Merge branch 'android-armeabi-c++_static' into releaseBrad King2016-10-212-5/+2
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Android: Fix support for armeabi with c++_staticBrad King2016-10-212-5/+2
| |/ / /
* | | | CMake 3.7.0-rc2v3.7.0-rc2Brad King2016-10-191-1/+1
|/ / /
* | | Merge branch 'fix-Android-NsightTegra' into releaseBrad King2016-10-183-2/+5
|\ \ \
| * | | Tests: Add VSNsightTegra test for VS 2015Brad King2016-10-181-0/+3
| * | | Tests: Fix VSNsightTegra test on Android NDK r12bBrad King2016-10-181-1/+1
| * | | VS: Fix NVIDIA Nsight Tegra Visual Studio Edition supportBrad King2016-10-181-1/+1
* | | | Merge branch 'cmake-server-pipe-mode-fix' into releaseBrad King2016-10-181-6/+5
|\ \ \ \
| * | | | server-mode: Fix named pipe modeTobias Hunger2016-10-181-6/+5
* | | | | Merge branch 'external-project-source-subdir-usage' into releaseBrad King2016-10-181-8/+9
|\ \ \ \ \
| * | | | | ExternalProject: make SOURCE_SUBDIR directly appendableBen Boeckel2016-10-181-6/+6
| * | | | | ExternalProject: error out only if the property is unsetBen Boeckel2016-10-181-2/+3
* | | | | | Merge branch 'FindwxWidgets-unversioned-library-path' into releaseBrad King2016-10-171-12/+22
|\ \ \ \ \ \
| * | | | | | FindwxWidgets: Fix finding unversioned VS-built directory prefixesBrad King2016-10-171-12/+22
| |/ / / / /
* | | | | | Merge branch 'osx-no-deployment-target-on-cross-compile' into releaseBrad King2016-10-171-1/+1
|\ \ \ \ \ \
| * | | | | | OS X: Do not try to set deployment target when cross-compilingGregor Jasny2016-10-171-1/+1
| |/ / / / /
* | | | | | Merge branch 'doc-math-EXPR' into releaseBrad King2016-10-141-4/+5
|\ \ \ \ \ \
| * | | | | | Help: Fix math(EXPR) documentation formattingBrad King2016-10-141-4/+5
| |/ / / / /
* | | | | | Merge branch 'doc-clarify-ctest-APPEND' into releaseBrad King2016-10-144-4/+12
|\ \ \ \ \ \
| * | | | | | Help: Clarify `ctest_*` APPEND option behaviorBrad King2016-10-144-4/+12
| |/ / / / /
* | | | | | Merge branch 'ninja-framework-POST_BUILD' into releaseBrad King2016-10-132-2/+9
|\ \ \ \ \ \
| * | | | | | Ninja: Fix POST_BUILD commands on macOS FrameworksBrad King2016-10-132-2/+9
| |/ / / / /
* | | | | | 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
| |/ / / / /
* | | | | | Merge branch 'ninja-rc-regression' into releaseBrad King2016-10-131-1/+1
|\ \ \ \ \ \