summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ / | |/| |
* | | | Merge branch 'qtifw-https-cmake.org' into releaseBrad King2016-10-041-1/+1
|\ \ \ \
| * | | | QtIFW: Reference cmake.org via https in cmake.org.htmlBrad King2016-10-041-1/+1
| |/ / /
* | | | Merge branch 'cmake-server-improve-shutdown' into releaseBrad King2016-10-043-53/+132
|\ \ \ \ | |_|/ / |/| | |
| * | | server-mode: Improve shutdown behaviorTobias Hunger2016-10-043-53/+132
| |/ /
* | | Merge branch 'fix-doc-3.7-relnotes' into releasev3.7.0-rc1Brad King2016-10-031-0/+4
|\ \ \
| * | | Help: Add 3.7 release note for CPack/NSISRoman Wüger2016-10-031-0/+4
| |/ /
* | | CMake 3.7.0-rc1 version updateBrad King2016-10-032-4/+4
* | | Help: Drop development topic notes to prepare releaseBrad King2016-10-032-9/+0
|/ /
* | Merge topic 'doc-3.7-relnotes'Brad King2016-10-0364-390/+310
|\ \
| * | Help: Organize and revise 3.7 release notesBrad King2016-10-011-164/+199
| * | Help: Consolidate 3.7 release notesBrad King2016-10-0164-390/+275
* | | Merge topic 'FindBoost-1.62'Brad King2016-10-031-1/+1
|\ \ \
| * | | FindBoost: Add 1.62 and 1.62.0 as supported versionsRoger Leigh2016-10-031-1/+1
* | | | Merge topic 'doc-target_link_libraries-flags'Brad King2016-10-031-0/+6
|\ \ \ \
| * | | | Help: Clarify treatment of link flags in target_link_librariesJohn Beard2016-10-031-0/+6
* | | | | Merge topic 'cmake-server-teardown-file-monitor'Brad King2016-10-031-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | cmake-server: Stop the file monitor on client disconnectBrad King2016-09-301-0/+1
* | | | | CMake Nightly Date StampKitware Robot2016-10-031-1/+1
* | | | | CMake Nightly Date StampKitware Robot2016-10-021-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'doc-cmake-A-link'Brad King2016-10-016-8/+10
|\ \ \ \