--- ray/src/util/CMakeLists.txt	2012/05/30 18:31:11	1.5
+++ ray/src/util/CMakeLists.txt	2014/04/15 22:36:25	1.15
@@ -1,7 +1,7 @@
 set(VERSION_FILE "${radiance_BINARY_DIR}/src/util/Version.c")
 create_version_file("${VERSION_FILE}")
 
-add_executable(dctimestep dctimestep.c)
+add_executable(dctimestep dctimestep.c cmbsdf.c cmatrix.c)
 target_link_libraries(dctimestep rtrad)
 
 add_executable(findglare findglare.c glareval.c glaresrc.c setscan.c)
@@ -26,10 +26,6 @@ target_link_libraries(ranimate rtrad)
 add_executable(rpiece rpiece.c "${VERSION_FILE}")
 target_link_libraries(rpiece rtrad)
 
-add_executable(rtcontrib
-  rtcontrib.c "${VERSION_FILE}")
-target_link_libraries(rtcontrib rtrad)
-
 add_executable(vwrays vwrays.c)
 target_link_libraries(vwrays rtrad)
 
@@ -45,6 +41,15 @@ target_link_libraries(ranimove raycalls radiance rtrad
 add_executable(rsensor rsensor.c)
 target_link_libraries(rsensor raycalls radiance rtrad)
 
+add_executable(rttree_reduce rttree_reduce.c)
+target_link_libraries(rttree_reduce rtrad)
+
+add_executable(rcollate rcollate.c)
+target_link_libraries(rcollate rtrad)
+
+add_executable(eplus_adduvf eplus_adduvf.c eplus_idf.c)
+target_link_libraries(eplus_adduvf rtrad)
+
 if(X11_FOUND)
   add_executable(xglaresrc
     xglaresrc.c ${CMAKE_CURRENT_SOURCE_DIR}/../common/x11findwind.c)
@@ -73,7 +78,7 @@ find_file(HAVE_SGISTEREO_H "SGIStereo.h" ${OPENGL_INCL
 if(NOT HAVE_SGISTEREO_H)
 	add_definitions(-DNOSTEREO)
 endif()
-if(UNIX)
+if(UNIX AND X11_FOUND)
 	add_executable(glrad glrad.c)
 	target_link_libraries(glrad rgl rtrad ${OPENGL_LIBRARIES} ${X11_LIBRARIES})
 	install(TARGETS rpiece RUNTIME DESTINATION bin)
@@ -82,19 +87,25 @@ if(UNIX)
   endif()
 endif()
 install(TARGETS dctimestep findglare getinfo glarendx rad ranimate
-                rtcontrib vwrays vwright ranimove rsensor
+                vwrays vwright ranimove rsensor rttree_reduce rcollate eplus_adduvf
         RUNTIME DESTINATION bin)
 
 if(WIN32)
   install(PROGRAMS genBSDF.pl DESTINATION bin)
+  install(PROGRAMS ltview.pl DESTINATION bin)
+  install(PROGRAMS ltpict.pl DESTINATION bin)
   install(PROGRAMS genklemsamp.pl DESTINATION bin)
   install(PROGRAMS genskyvec.pl DESTINATION bin)
-  install(FILES tregsamp.dat DESTINATION bin)
+  install(FILES tregsamp.dat DESTINATION lib)
+  install(PROGRAMS objview.rb DESTINATION bin)
 else()
   install(PROGRAMS genBSDF.pl DESTINATION bin RENAME genBSDF)
+  install(PROGRAMS ltview.pl DESTINATION bin RENAME ltview)
+  install(PROGRAMS ltpict.pl DESTINATION bin RENAME ltpict)
   install(PROGRAMS genklemsamp.pl DESTINATION bin RENAME genklemsamp)
   install(PROGRAMS genskyvec.pl DESTINATION bin RENAME genskyvec)
   install(PROGRAMS objview.csh DESTINATION bin RENAME objview)
+  install(PROGRAMS objview.rb DESTINATION bin)
   install(PROGRAMS objpict.csh DESTINATION bin RENAME objpict)
   install(PROGRAMS glare.csh DESTINATION bin RENAME glare)
   install(PROGRAMS dayfact.csh DESTINATION bin RENAME dayfact)