summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | / / / | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | cmake-gui: Fix "extra" generator entries in drop-down listBrad King2016-10-111-1/+1
| |/ / / / / / / / /
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-10-131-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-10-121-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-10-111-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'extract-cmLinkLineComputer'Brad King2016-10-1026-183/+527
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | cmLinkLineComputer: Extract link libraries computation from cmLocalGeneratorStephen Kelly2016-10-105-34/+37
| * | | | | | cmLinkLineComputer: Move FrameworkPath computation from cmLocalGeneratorStephen Kelly2016-10-1012-34/+39
| * | | | | | cmLocalGenerator: Inline last use of local variableStephen Kelly2016-10-101-3/+1
| * | | | | | cmLinkLineComputer: Move RPath computation from cmLocalGeneratorStephen Kelly2016-10-108-36/+52
| * | | | | | cmLinkLineComputer: Move LinkPath computation from cmLocalGeneratorStephen Kelly2016-10-103-11/+35
| * | | | | | cmLinkLineComputer: Move ComputeLinkLibs from cmLocalGeneratorStephen Kelly2016-10-1019-49/+113
| * | | | | | cmLocalGenerator: Move variable to where it is usedStephen Kelly2016-10-101-2/+2
| * | | | | | cmLocalGenerator: Use a std::string instead of char*Stephen Kelly2016-10-101-2/+3
| * | | | | | cmLocalGenerator: Move stringstream to where it is usedStephen Kelly2016-10-101-1/+1
| * | | | | | cmLocalGenerator: Move flag determination up in the functionStephen Kelly2016-10-101-8/+9
| * | | | | | cmLocalGenerator: Separate stdlib content from library streamStephen Kelly2016-10-101-1/+5
| * | | | | | cmLocalGenerator: Separate rpath content from library streamStephen Kelly2016-10-101-7/+9
| * | | | | | cmLocalGenerator: Pass link library info to OutputLinkLibrariesStephen Kelly2016-10-103-20/+27
| * | | | | | Makefiles: Port CreateLinkLibs to cmLinkLineComputerStephen Kelly2016-10-104-13/+20
| * | | | | | cmLinkLineComputer: Extract from cmLocalGeneratorStephen Kelly2016-10-1026-79/+282
| * | | | | | Ninja: ConstifyStephen Kelly2016-10-102-4/+6
| * | | | | | cmLocalGenerator: Inline conversion into link computationStephen Kelly2016-10-101-1/+8
|/ / / / / /
* | | | | | Merge branch 'release'Brad King2016-10-100-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'update-kwsys' into releaseBrad King2016-10-081-11/+9
| |\ \ \ \ \