--- ray/src/rt/CMakeLists.txt	2015/04/02 16:42:50	1.10
+++ ray/src/rt/CMakeLists.txt	2015/05/08 18:07:38	1.11
@@ -44,10 +44,11 @@ if(X11_FOUND)
   set(X11_SOURCES x11.c x11twind.c)
   add_definitions("-DHAS_X11")
 endif()
-if(QT4_FOUND)
+if(Qt5Widgets_DIR)
+  include_directories(${Qt5Widgets_INCLUDE_DIRS})
   add_definitions("-DHAS_QT")
 endif()
-if (X11_FOUND OR QT4_FOUND)
+if (X11_FOUND OR Qt5Widgets_DIR)
   add_executable(rvu
     rvmain.c rview.c rv2.c rv3.c devtable.c devcomm.c editline.c ${X11_SOURCES}
     colortab.c)
@@ -55,7 +56,7 @@ if (X11_FOUND OR QT4_FOUND)
   list(APPEND targets_to_install rvu)
 
   # only link to rvu-qt-lib if qt is found
-  if(QT4_FOUND)
+  if(Qt5Widgets_DIR)
     target_link_libraries(rvu qtrvu)
   endif()
 endif()
@@ -71,11 +72,25 @@ install(TARGETS ${targets_to_install}
 install(FILES rayinit.cal DESTINATION lib)
 
 #install qt.conf & Qt plugins loaded by rvu at runtime
-install(FILES ${QT_QGIF_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
-install(FILES ${QT_QICO_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
-install(FILES ${QT_QJPEG_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
-install(FILES ${QT_QMNG_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
-install(FILES ${QT_QSVG_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
-install(FILES ${QT_QTIFF_${qt_plugin_term}_RELEASE} DESTINATION bin/plugins/imageformats)
+get_target_property(GIF_PLUGIN Qt5::QGifPlugin LOCATION)
+get_target_property(ICO_PLUGIN Qt5::QICOPlugin LOCATION)
+get_target_property(JPEG_PLUGIN Qt5::QJpegPlugin LOCATION)
+get_target_property(MNG_PLUGIN Qt5::QMngPlugin LOCATION)
+get_target_property(TIFF_PLUGIN Qt5::QTiffPlugin LOCATION)
+install(PROGRAMS "${GIF_PLUGIN}" DESTINATION bin/plugins/imageformats)
+install(PROGRAMS "${ICO_PLUGIN}" DESTINATION bin/plugins/imageformats)
+install(PROGRAMS "${JPEG_PLUGIN}" DESTINATION bin/plugins/imageformats)
+install(PROGRAMS "${MNG_PLUGIN}" DESTINATION bin/plugins/imageformats)
+install(PROGRAMS "${TIFF_PLUGIN}" DESTINATION bin/plugins/imageformats)
 install(FILES ${CMAKE_SOURCE_DIR}/InstallRules/qt.conf DESTINATION bin)
+
+if(APPLE OR WIN32)
+  if(WIN32)
+    get_target_property(QPA_PLUGIN Qt5::QWindowsIntegrationPlugin LOCATION)
+  elseif(APPLE)
+    get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
+  endif()
+
+  install(PROGRAMS "${QPA_PLUGIN}" DESTINATION bin/plugins/platforms)
+endif()