6 files changed, 18 insertions, 9 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index ccc36eb..89547af 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -174,7 +174,7 @@
 #  create Start Menu shortcuts. For example, setting this to the list
 #  ccmake;CMake will create a shortcut named "CMake" that will execute the
 #  installed executable ccmake. Not all CPack generators use it (at least
-#  NSIS and OSXX11 do).
+#  NSIS, WIX and OSXX11 do).
 #
 # .. variable:: CPACK_STRIP_FILES
 #
@@ -261,6 +261,8 @@
 # .. variable:: CPACK_CREATE_DESKTOP_LINKS
 #
 #  List of desktop links to create.
+#  Each desktop link requires a corresponding start menu shortcut
+#  as created by :variable:`CPACK_PACKAGE_EXECUTABLES`.
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 7d98f03..1d651e3 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -8,9 +8,5 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
 
 set(CMAKE_DEPFILE_FLAGS_C "-MMD -MT <OBJECT> -MF <DEPFILE>")
 
-if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
-  set(CMAKE_C_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
-endif()
-
 set(CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
 set(CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 36a838d..020e862 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -8,9 +8,5 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
 
 set(CMAKE_DEPFILE_FLAGS_CXX "-MMD -MT <OBJECT> -MF <DEPFILE>")
 
-if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0)
-  set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
-endif()
-
 set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
 set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index e188c62..d0515c6 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1147,6 +1147,11 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer designer4)
   _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist linguist4)
 
+  if (NOT TARGET Qt4::qmake)
+    add_executable(Qt4::qmake IMPORTED)
+    set_property(TARGET Qt4::qmake PROPERTY IMPORTED_LOCATION ${QT_QMAKE_EXECUTABLE})
+  endif()
+
   if (QT_MOC_EXECUTABLE)
      set(QT_WRAP_CPP "YES")
   endif ()
diff --git a/Modules/Platform/Darwin-icc.cmake b/Modules/Platform/Darwin-icc.cmake
index 0fab9a1..c7e31c0 100644
--- a/Modules/Platform/Darwin-icc.cmake
+++ b/Modules/Platform/Darwin-icc.cmake
@@ -75,6 +75,12 @@ if(XCODE)
   set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
 endif()
 
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
+  set(CMAKE_C_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
+  set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
+endif()
+
+
 set(CMAKE_MacOSX_Content_COMPILE_OBJECT "\"${CMAKE_COMMAND}\" -E copy_if_different <SOURCE> <OBJECT>")
 
 set(CMAKE_C_CREATE_SHARED_LIBRARY
diff --git a/Modules/Platform/Linux-Intel.cmake b/Modules/Platform/Linux-Intel.cmake
index 2394f10..20fddb4 100644
--- a/Modules/Platform/Linux-Intel.cmake
+++ b/Modules/Platform/Linux-Intel.cmake
@@ -47,4 +47,8 @@ macro(__linux_compiler_intel lang)
       "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
       "${XIAR} -s <TARGET> ")
   endif()
+
+  if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 12.0)
+    set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
+  endif()
 endmacro()