Merge topic 'find-Qt4-granular-modules'

b8af46c FindQt4: Don't fail if certain Qt modules are unavailable.
Merge topic 'fix-qt4_use_modules-QtAx'

ce0c480 Qt4Macros: Handle Qt ActiveX libraries in qt4_use_modules.
Merge topic 'framework-refactor'

373faae Refactor how bundles and frameworks are supported.
Merge topic 'xcode-shlib-versioning'

cbe3f20 Xcode: Add support for shared library versioning
Merge topic 'rpath-on-mac'

dc1d025 OS X: Add test for rpaths on Mac.
8576b3f OS X: Add support for @rpath in export files.
00d71bd Xcode: Add rpath support in Xcode generator.
94e7fef OS X: Add RPATH support for Mac.
Merge topic 'qt4-qt5-CMAKE_AUTOMOC'

fa55751 QtAutomoc: Get the Qt version through the target link interface
f776316 Use the qt5::moc imported target instead of a variable.
Merge topic 'SelectLibraryConfigurations-cached-library'

a2099a8 SelectLibraryConfigurations: Fix for cached <base>_LIBRARY
Merge topic 'FindImageMagick-v6-includes'

3de9bb4 FindImageMagick: Find v6 include dir (#14174)
Merge topic 'fix-style'

e162326 Fix indentation.
Merge topic 'vs-RootNamespace'

cca955a VS: Add VS_GLOBAL_ROOTNAMESPACE target property
Merge topic 'refactor-try_compile-argument-processing'

d06db7e try_compile: Refactor argument processing
b680824 try_compile: Add test for bad call error cases
Merge topic 'target-COMPILE_OPTIONS'

24466f2 Add target_compile_options command.
80ca9c4 Add COMPILE_OPTIONS target property.
7cb2308 cmTarget: Rename LinkInterfaceIncludeDirectoriesEntries
47f80d9 cmTarget: Rename struct to be more re-usable.
1319a14 Add <LANG>_COMPILER_ID generator expressions.
3549676 Add cmLocalGenerator::GetCompileOptions.
f3ad863 VS6: Rename some variables to correspond to config values.
Merge topic 'useless-MATCHES'

cd4451d replace string(... MATCHES "^const$) with string(... STREQUAL "const")
Merge branch 'master' into next