--- ray/src/rt/CMakeLists.txt	2012/04/25 22:21:06	1.4
+++ ray/src/rt/CMakeLists.txt	2015/05/08 18:07:38	1.11
@@ -2,11 +2,14 @@ set(VERSION_FILE "${radiance_BINARY_DIR}/src/rt/Versio
 create_version_file("${VERSION_FILE}")
 
 add_library(radiance
-  ambcomp.c ambient.c ambio.c aniso.c data.c dielectric.c fprism.c freeobjmem.c 
+  ambcomp.c ambient.c ambio.c aniso.c ashikhmin.c data.c dielectric.c fprism.c freeobjmem.c 
   func.c glass.c initotypes.c m_alias.c m_brdf.c m_bsdf.c m_clip.c m_direct.c
   m_mirror.c m_mist.c mx_func.c mx_data.c noise3.c normal.c o_face.c o_cone.c
   o_instance.c o_mesh.c p_data.c p_func.c preload.c raytrace.c renderopts.c
   source.c sphere.c srcobstr.c srcsupp.c srcsamp.c t_data.c t_func.c text.c
+  pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c 
+  pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c 
+  pmapdata.c pmapdiag.c pmaptype.c
   "${VERSION_FILE}" virtuals.c)
 
 if(WIN32)
@@ -22,31 +25,72 @@ target_link_libraries(rtrace raycalls radiance rtrad)
 
 add_executable(rpict rpmain.c rpict.c srcdraw.c duphead.c persist.c)
 target_link_libraries(rpict radiance rtrad)
+
+add_executable(lookamb lookamb.c ambio.c)
+target_link_libraries(lookamb rtrad)
+
+add_executable(rcontrib rcmain.c rcontrib.c rc2.c rc3.c)
+target_link_libraries(rcontrib radiance rtrad)
+
+add_executable(mkpmap mkpmap.c)
+target_link_libraries(mkpmap radiance rtrad)
+
+add_executable(pmapdump pmapdump.c pmaptype.c pmapparm.c)
+target_link_libraries(pmapdump radiance rtrad)
+
+set(targets_to_install lookamb radiance raycalls rtrace rpict rcontrib mkpmap pmapdump)
+
 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()
-add_executable(rvu
-  rvmain.c rview.c rv2.c rv3.c devtable.c devcomm.c editline.c ${X11_SOURCES}
-  colortab.c)
-target_link_libraries(rvu raycalls radiance rtrad ${X11_LIBRARIES})
-# only link to rvu-qt-lib if qt is found
-if(QT4_FOUND)
-  target_link_libraries(rvu qtrvu)
+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)
+  target_link_libraries(rvu raycalls radiance rtrad ${X11_LIBRARIES})
+  list(APPEND targets_to_install rvu)
+
+  # only link to rvu-qt-lib if qt is found
+  if(Qt5Widgets_DIR)
+    target_link_libraries(rvu qtrvu)
+  endif()
 endif()
 
-add_executable(lookamb lookamb.c ambio.c)
-target_link_libraries(lookamb rtrad)
-
 add_test(rtrace_Version ${EXECUTABLE_OUTPUT_PATH}/rtrace -version)
 set_tests_properties(rtrace_Version PROPERTIES
   PASS_REGULAR_EXPRESSION "RADIANCE")
 
-install(TARGETS lookamb radiance raycalls rtrace rpict rvu
+install(TARGETS ${targets_to_install}
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION bin
         ARCHIVE DESTINATION bin)
 install(FILES rayinit.cal DESTINATION lib)
+
+#install qt.conf & Qt plugins loaded by rvu at runtime
+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()
+