summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Ninja: Fix RC language depfile generation with cmcldepsBen Boeckel2016-10-131-1/+1
| |/
* | Merge branch 'ice-3.6.3' into releaseBrad King2016-10-131-0/+1
|\ \
| * | FindIce: Add support for version 3.6.3Roger Leigh2016-10-131-0/+1
| |/
* | Merge branch 'cmake-gui-fix-extra-generator-names' into releaseBrad King2016-10-111-1/+1
|\ \
| * | cmake-gui: Fix "extra" generator entries in drop-down listBrad King2016-10-111-1/+1
| |/
* | Merge branch 'ExternalProject-fix-CMAKE_CACHE_ARGS-list' into releaseBrad King2016-10-105-3/+25
|\ \
| * | ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGSMax Smolens2016-10-105-3/+25
| |/
* | Merge branch 'vs15-separate-flag-table' into releaseBrad King2016-10-103-3/+247
|\ \
| * | VS: Split flag table between v140 and v141 toolsetsBrad King2016-10-103-3/+247
| |/
* | Merge branch 'update-kwsys' into releaseBrad King2016-10-081-11/+9
|\ \
| * \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-10-081-11/+9
| |\ \ | | |/ | |/|
| | * KWSys 2016-10-07 (dfe9b386)KWSys Upstream2016-10-081-11/+9
* | | Merge branch 'android-export-has-cpp' into releaseBrad King2016-10-075-1/+22
|\ \ \
| * | | Android: Record use of C++ by static libs in exported Android.mk filesBrad King2016-10-075-1/+22
| |/ /
* | | Merge branch 'FindProtobuf-fix-subdirs' into releaseBrad King2016-10-071-6/+10
|\ \ \
| * | | FindProtobuf: Fix protobuf_generate_*() to handle subdirsMartin Joly2016-10-071-6/+10
| |/ /
* | | Merge branch 'android-cxxabi' into releaseBrad King2016-10-073-0/+7
|\ \ \
| * | | Android: Fix support for cxxabi.h with libc++Brad King2016-10-073-0/+7
* | | | Merge branch 'check-libuv-minimum-version' into releaseBrad King2016-10-071-2/+6
|\ \ \ \
| * | | | Set minimum version for LibUV to 1.0.0Chuck Atkins2016-10-071-1/+1
| * | | | Use find_package for JsonCpp and LibUV instead of includeChuck Atkins2016-10-071-2/+6
* | | | | Merge branch 'codelite-global-setting' into releaseBrad King2016-10-074-5/+27
|\ \ \ \ \
| * | | | | Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globallyStephen Kelly2016-10-072-5/+4
| * | | | | cmGlobalGenerator: Add API to get settings from top-level cmMakefileStephen Kelly2016-10-062-0/+23
| | |_|/ / | |/| | |
* | | | | Merge branch 'android-ndk-r13' into releaseBrad King2016-10-062-3/+9
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Android: Update libc++ include directories for NDK r13Brad King2016-10-061-1/+7
| * | | | Android: Suppress -Wattributes warnings in test case buildsBrad King2016-10-061-2/+2
| |/ / /
* | | | Merge branch 'cpack-rpm-debuginfo-fixes' into releaseBrad King2016-10-061-28/+40
|\ \ \ \
| * | | | CPack/RPM debuginfo package without binariesDomen Vrankar2016-10-061-27/+38
| * | | | CPack/RPM debuginfo package objdump error suppressionDomen Vrankar2016-10-061-1/+2
| |/ / /
* | | | Merge branch 'FindMatlab-fix-simulink-cache' into releaseBrad King2016-10-051-0/+1
|\ \ \ \
| * | | | FindMatlab: remove SIMULINK path from cache when FindMatlab is reconfiguredRaffi Enficiaud2016-10-051-0/+1
| | |/ / | |/| |
* | | | Merge branch 'FindMatlab-documentation' into releaseBrad King2016-10-052-9/+15
|\ \ \ \
| * | | | Help: Extend 3.7 release notes for FindMatlabRaffi Enficiaud2016-10-051-1/+8
| * | | | FindMatlab: small documentation fixesRaffi Enficiaud2016-10-051-8/+7
| |/ / /
* | | | Merge branch 'fix-VS-resources-pri-path' into releaseBrad King2016-10-051-2/+4
|\ \ \ \
| * | | | VS: Use absolute target-specific directory for `resources.pri`Roman Wüger2016-10-051-2/+4
| | |/ / | |/| |