summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'vs-host-x64-tools'Brad King2016-10-1429-7/+209
|\
| * VS: Provide an option to use x64 host toolsBrad King2016-10-1425-1/+162
| * Help: Document VS and Xcode toolset selectionBrad King2016-10-137-6/+47
* | Merge topic 'flush-archive-list'Brad King2016-10-141-0/+1
|\ \
| * | cmSystemTools: Flush output buffer for list_item_verboseDāvis Mosāns2016-10-131-0/+1
* | | Merge topic 'FindBoost-minor-cleanup'Brad King2016-10-141-13/+11
|\ \ \
| * | | FindBoost: Simplify library dir detection with cascading if/elseif/elseAlex Turbov2016-10-131-6/+4
| * | | FindBoost: Minor style updatesAlex Turbov2016-10-131-2/+2
| * | | FindBoost: Use list(INSERT) to simplify suffix list generationAlex Turbov2016-10-131-1/+1
| * | | FindBoost: Use string(APPEND) in more casesAlex Turbov2016-10-131-4/+4
* | | | Merge topic 'st2-exclude-patterns-variable'Brad King2016-10-145-2/+26
|\ \ \ \
| * | | | Sublime: Exclude build tree from source tree project only optionallyBruno Pedrosa2016-10-125-2/+26
* | | | | Merge topic 'ninja-framework-POST_BUILD'Brad King2016-10-142-2/+9
|\ \ \ \ \
| * | | | | Ninja: Fix POST_BUILD commands on macOS FrameworksBrad King2016-10-132-2/+9
* | | | | | Merge topic 'ninja-rc-regression'Brad King2016-10-141-1/+1
|\ \ \ \ \ \
| * | | | | | Ninja: Fix RC language depfile generation with cmcldepsBen Boeckel2016-10-131-1/+1
| |/ / / / /
* | | | | | Merge topic 'LINK_WHAT_YOU_USE-allow-OFF'Brad King2016-10-143-6/+6
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into LINK_WHAT_YOU_USE-al...Brad King2016-10-130-0/+0
| |\ \ \ \ \ \
| | * | | | | | Honor LINK_WHAT_YOU_USE when set to OFFJamie Snape2016-10-133-6/+6
| | |/ / / / /
| * | | | | | Honor LINK_WHAT_YOU_USE when set to OFFJamie Snape2016-10-133-6/+6
| | |/ / / / | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-10-141-1/+1
* | | | | | Merge branch 'release'Brad King2016-10-130-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'cmake-gui-fix-extra-generator-names' into releaseBrad King2016-10-111-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ExternalProject-fix-CMAKE_CACHE_ARGS-list' into releaseBrad King2016-10-105-3/+25
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'vs15-separate-flag-table' into releaseBrad King2016-10-103-3/+247
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'ice-3.6.3'Brad King2016-10-131-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | FindIce: Add support for version 3.6.3Roger Leigh2016-10-131-0/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'msbuild-json'Brad King2016-10-131-0/+453
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add a script to convert from MSBuild XML to a JSON formatDon Olmstead2016-10-121-0/+453
* | | | | | | | | | | Merge topic 'vs-default-generator'Brad King2016-10-132-48/+60
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cmake: Fix default VS generator selection for Microsoft Build ToolsBrad King2016-10-111-7/+13
| * | | | | | | | | | | cmake: Simplify default generator search by switching directionBrad King2016-10-111-12/+10
| * | | | | | | | | | | cmake: Use array iteration for default generator VS variantsBrad King2016-10-111-6/+7
| * | | | | | | | | | | cmake: Use array iteration for default generator listBrad King2016-10-111-5/+5
| * | | | | | | | | | | cmake: Rename default generator selection list variableBrad King2016-10-111-5/+5
| * | | | | | | | | | | cmake: Rename default generator selection internal variableBrad King2016-10-111-4/+3
| * | | | | | | | | | | cmake: Simplify VS registry entry lookupBrad King2016-10-111-4/+6
| * | | | | | | | | | | cmake: Factor out default generator selection into helperBrad King2016-10-112-48/+54
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'FindSDL-mingw-mwindows'Brad King2016-10-131-4/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | FindSDL: Add -mwindows to link flags for MinGW, correct wordingEmil Laine2016-10-121-4/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'FindProtobuf-debug-suffix'Brad King2016-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | FindProtobuf: Search for debug library named with `d` suffixAdam Martin2016-10-101-1/+1
* | | | | | | | | | | | Merge topic 'remove-obsolete'Brad King2016-10-134-70/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Makefiles: Remove query for CMAKE_OBJECT_NAMEStephen Kelly2016-10-091-3/+1
| * | | | | | | | | | | | Makefiles: Remove forbidden flag logicStephen Kelly2016-10-094-67/+0
* | | | | | | | | | | | | Merge topic 'ExternalProject-fix-CMAKE_CACHE_ARGS-list'Brad King2016-10-135-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGSMax Smolens2016-10-105-3/+25
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge topic 'vs15-separate-flag-table'Brad King2016-10-133-3/+247
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | VS: Split flag table between v140 and v141 toolsetsBrad King2016-10-103-3/+247
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'cmake-gui-fix-extra-generator-names'Brad King2016-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |