--- ray/src/rt/CMakeLists.txt	2011/10/22 22:38:10	1.1
+++ ray/src/rt/CMakeLists.txt	2012/06/19 17:08:55	1.7
@@ -1,11 +1,5 @@
 set(VERSION_FILE "${radiance_BINARY_DIR}/src/rt/Version.c")
-add_custom_command(
-  OUTPUT "${VERSION_FILE}"
-  COMMAND "${CMAKE_COMMAND}"
-  -DVERSION_OUT_FILE="${VERSION_FILE}"
-  -DVERSION_IN_FILE="${radiance_SOURCE_DIR}/src/util/VERSION"
-  -P "${radiance_SOURCE_DIR}/src/common/create_version.cmake"
-)
+create_version_file("${VERSION_FILE}")
 
 add_library(radiance
   ambcomp.c ambient.c ambio.c aniso.c data.c dielectric.c fprism.c freeobjmem.c 
@@ -47,12 +41,25 @@ endif()
 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_test(rtrace_Version ${EXECUTABLE_OUTPUT_PATH}/rtrace -version)
 set_tests_properties(rtrace_Version PROPERTIES
   PASS_REGULAR_EXPRESSION "RADIANCE")
 
-install(TARGETS radiance raycalls rtrace rpict rvu
+install(TARGETS lookamb radiance raycalls rtrace rpict rvu rcontrib
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION bin
         ARCHIVE DESTINATION bin)
-install(FILES rayinit.cal DESTINATION bin)
+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)
+install(FILES ${CMAKE_SOURCE_DIR}/InstallRules/qt.conf DESTINATION bin)
+