--- ray/src/util/CMakeLists.txt	2014/06/01 03:20:29	1.18
+++ ray/src/util/CMakeLists.txt	2016/04/25 16:15:19	1.23
@@ -50,9 +50,18 @@ target_link_libraries(rcollate rtrad)
 add_executable(rmtxop rmtxop.c rmatrix.c cmbsdf.c cmatrix.c)
 target_link_libraries(rmtxop rtrad)
 
+add_executable(wrapBSDF wrapBSDF.c)
+target_link_libraries(wrapBSDF rtrad)
+
 add_executable(eplus_adduvf eplus_adduvf.c eplus_idf.c)
 target_link_libraries(eplus_adduvf rtrad)
 
+add_executable(rfluxmtx rfluxmtx.c)
+target_link_libraries(rfluxmtx rtrad)
+
+add_executable(evalglare evalglare.c pictool.c)
+target_link_libraries(evalglare rtrad libreetz)
+
 if(X11_FOUND)
   add_executable(xglaresrc
     xglaresrc.c ${CMAKE_CURRENT_SOURCE_DIR}/../common/x11findwind.c)
@@ -84,17 +93,25 @@ endif()
 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)
+	install(TARGETS glrad RUNTIME DESTINATION bin)
   if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
     target_link_libraries(glrad rt)
   endif()
 endif()
+
+if(UNIX)
+  install (TARGETS rpiece RUNTIME DESTINATION bin)
+endif()
+
 install(TARGETS dctimestep findglare getinfo glarendx rad ranimate
-                vwrays vwright ranimove rsensor rttree_reduce rcollate
-		rmtxop eplus_adduvf
-        RUNTIME DESTINATION bin)
+    vwrays vwright ranimove rsensor rttree_reduce rcollate
+		eplus_adduvf rfluxmtx rmtxop wrapBSDF evalglare
+    RUNTIME DESTINATION bin)
 
-install(FILES tregsamp.dat DESTINATION lib)
+install(FILES rambpos.cal ambpos.cal tregsamp.dat reinhartb.cal 
+    klems_full.cal klems_half.cal klems_quarter.cal disk2square.cal
+    WINDOW6BSDFt.xml minimalBSDFt.xml
+    DESTINATION lib)
 
 if(WIN32)
   install(PROGRAMS genBSDF.pl DESTINATION bin)