Merge topic 'encoding-ctest-fixes'

09b2ac38 Encoding:  Fix a few encoding problems with ctest.
Merge topic 'identify-qthelp-artifacts'

376ba935 Help: Identify more artifact types in QtHelp documentation.
Merge topic 'fix_Xcode_generator_name'

3526478c Tests: Activate tests accidentally excluded from Xcode
Merge topic 'vs-MSTool-condition'

7a9909db VS: Make MS-tool-specific options conditional
Merge topic 'delay-generator-platform'

7a526c35 VS: Delay getting platform name in local generator
e7fdb44b VS: Delay detection of VS 10 Express 64-bit tools
6e176e6d VS: Delay platform definitions until system name is known
d3d9218a VS: Remove unused method from VS 9 generator
eeb60102 VS: Refactor CMAKE_FORCE_*64 platform definitions
ecb34faa Tell generators about CMAKE_SYSTEM_NAME as soon as it is known
Merge branch 'master' into next
Merge topic 'dev/target-fastpaths'

a9c9b66c cmTarget: use a hash_map for cmTargets typedef
bcb6dbc1 cmTarget: help the optimizer a bit
679f3dee cmTarget: use hash_set for sets of strings
23d6520d cmTarget: Allow caching of empty genex expansions
cd54f1db cmTarget: Only copy GenEx expansions when necessary
b75fc0e1 cmTarget: Don't set properties on custom targets
66076915 cmTarget: Use static strings for special property names
cebefa71 cmTarget: Sort special property checks
97ce676e cmTarget: Fast path for regular properties
4cfa918a cmTarget: Factor out common code
85242b7d cmTarget: Use else/if trees rather than an if tree
Merge branch 'master' into next