--- ray/src/util/CMakeLists.txt	2014/02/10 17:50:02	1.13
+++ ray/src/util/CMakeLists.txt	2014/06/01 03:20:29	1.18
@@ -47,6 +47,9 @@ target_link_libraries(rttree_reduce rtrad)
 add_executable(rcollate rcollate.c)
 target_link_libraries(rcollate rtrad)
 
+add_executable(rmtxop rmtxop.c rmatrix.c cmbsdf.c cmatrix.c)
+target_link_libraries(rmtxop rtrad)
+
 add_executable(eplus_adduvf eplus_adduvf.c eplus_idf.c)
 target_link_libraries(eplus_adduvf rtrad)
 
@@ -78,7 +81,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)
@@ -87,22 +90,29 @@ if(UNIX)
   endif()
 endif()
 install(TARGETS dctimestep findglare getinfo glarendx rad ranimate
-                vwrays vwright ranimove rsensor rttree_reduce rcollate eplus_adduvf
+                vwrays vwright ranimove rsensor rttree_reduce rcollate
+		rmtxop eplus_adduvf
         RUNTIME DESTINATION bin)
 
+install(FILES tregsamp.dat DESTINATION lib)
+
 if(WIN32)
   install(PROGRAMS genBSDF.pl DESTINATION bin)
   install(PROGRAMS genklemsamp.pl DESTINATION bin)
   install(PROGRAMS genskyvec.pl DESTINATION bin)
-  install(FILES tregsamp.dat DESTINATION lib)
-  install(PROGRAMS objview.rb DESTINATION bin)
+  install(PROGRAMS ltview.pl DESTINATION bin)
+  install(PROGRAMS ltpict.pl DESTINATION bin)
+  install(PROGRAMS objview.pl DESTINATION bin)
+  install(PROGRAMS objpict.pl DESTINATION bin)
 else()
   install(PROGRAMS genBSDF.pl DESTINATION bin RENAME genBSDF)
   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 genambpos.csh DESTINATION bin RENAME genambpos)
+  install(PROGRAMS ltview.pl DESTINATION bin)
+  install(PROGRAMS ltpict.pl DESTINATION bin)
+  install(PROGRAMS objview.pl DESTINATION bin RENAME objview)
+  install(PROGRAMS objpict.pl DESTINATION bin RENAME objpict)
   install(PROGRAMS glare.csh DESTINATION bin RENAME glare)
   install(PROGRAMS dayfact.csh DESTINATION bin RENAME dayfact)
   install(PROGRAMS rlux.csh DESTINATION bin RENAME rlux)
@@ -111,7 +121,5 @@ else()
   install(PROGRAMS objline.csh DESTINATION bin RENAME objline)
   install(PROGRAMS compamb.csh DESTINATION bin RENAME compamb)
   install(PROGRAMS vinfo.csh DESTINATION bin RENAME vinfo)
-  install(PROGRAMS genambpos.csh DESTINATION bin RENAME genambpos)
   install(PROGRAMS fieldcomb.csh DESTINATION bin RENAME fieldcomb)
-  install(FILES tregsamp.dat DESTINATION lib)
 endif()