--- ray/src/util/CMakeLists.txt	2014/03/20 22:49:21	1.14
+++ ray/src/util/CMakeLists.txt	2019/07/19 22:25:03	1.32
@@ -15,11 +15,13 @@ target_link_libraries(glarendx rtrad)
 
 add_executable(rad rad.c)
 target_link_libraries(rad rtrad)
+
 if(WIN32)
   set(netproc_SOURCES win_netproc.c)
 else()
   set(netproc_SOURCES netproc.c)
 endif()
+
 add_executable(ranimate ranimate.c ${netproc_SOURCES})
 target_link_libraries(ranimate rtrad)
 
@@ -33,7 +35,7 @@ add_executable(vwright vwright.c)
 target_link_libraries(vwright rtrad)
 
 #the next few libraries all need to include header files from the rt directory
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../rt)
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../rt")
 
 add_executable(ranimove ranimove.c ranimove1.c ranimove2.c)
 target_link_libraries(ranimove raycalls radiance rtrad)
@@ -47,25 +49,53 @@ 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(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)
+
+add_executable(radcompare radcompare.c)
+target_link_libraries(radcompare rtrad)
+
+add_executable(rcode_depth rcode_depth.c depthcodec.c)
+target_link_libraries(rcode_depth rtrad)
+
+add_executable(rcode_norm rcode_norm.c normcodec.c)
+target_link_libraries(rcode_norm rtrad)
+
+add executable(rcode_ident rcode_ident.c idmap.c)
+target_link_libraries(rcode_ident rtrad)
+
 if(X11_FOUND)
   add_executable(xglaresrc
-    xglaresrc.c ${CMAKE_CURRENT_SOURCE_DIR}/../common/x11findwind.c)
+    xglaresrc.c
+    "${CMAKE_CURRENT_SOURCE_DIR}/../common/x11findwind.c"
+  )
   target_link_libraries(xglaresrc rtrad ${X11_LIBRARIES})
-  install(TARGETS xglaresrc RUNTIME DESTINATION bin)
+  install(TARGETS xglaresrc
+    RUNTIME DESTINATION "bin"
+  )
 endif()
 
 #glrad needs to link against OpenGL libraries
 if(APPLE)
   find_library(OPENGL_gl_LIBRARY
     NAMES GL MesaGL
-    PATHS /usr/X11R6/lib
+    PATHS ${X11_LIB_SEARCH_PATH}
   )
   find_library(OPENGL_glu_LIBRARY
     NAMES GLU MesaGLU
-    PATHS /usr/X11R6/lib
+    PATHS ${X11_LIB_SEARCH_PATH}
   )
   set(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
 else()
@@ -73,45 +103,96 @@ else()
   include_directories(${OPENGL_INCLUDE_DIR})
 endif()
 
-#check if	we have	SGIStereo.h
+#check if we have SGIStereo.h
 find_file(HAVE_SGISTEREO_H "SGIStereo.h" ${OPENGL_INCLUDE_DIR})
 if(NOT HAVE_SGISTEREO_H)
-	add_definitions(-DNOSTEREO)
+  add_definitions(-DNOSTEREO)
 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)
+  add_executable(glrad glrad.c)
+  target_link_libraries(glrad rgl rtrad ${OPENGL_LIBRARIES} ${X11_LIBRARIES})
+  install(TARGETS glrad
+    RUNTIME DESTINATION "bin"
+  )
   if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
     target_link_libraries(glrad rt)
   endif()
 endif()
-install(TARGETS dctimestep findglare getinfo glarendx rad ranimate
-                vwrays vwright ranimove rsensor rttree_reduce rcollate eplus_adduvf
-        RUNTIME DESTINATION bin)
 
+if(UNIX)
+  install(TARGETS rpiece
+    RUNTIME DESTINATION "bin"
+  )
+endif()
+
+install(TARGETS
+  dctimestep
+  eplus_adduvf
+  evalglare
+  findglare
+  getinfo
+  glarendx
+  rad
+  radcompare
+  ranimate
+  ranimove
+  rcollate
+  rfluxmtx
+  rmtxop
+  rsensor
+  rttree_reduce
+  vwrays
+  vwright
+  wrapBSDF
+  RUNTIME DESTINATION "bin"
+)
+
+file(COPY
+  ambpos.cal
+  disk2square.cal
+  klems_full.cal
+  klems_half.cal
+  klems_quarter.cal
+  minimalBSDFt.xml
+  rambpos.cal
+  reinhartb.cal
+  tregsamp.dat
+  WINDOW6BSDFt.xml
+  DESTINATION "${CMAKE_BINARY_DIR}/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
+    bsdfview.pl
+    genBSDF.pl
+    genklemsamp.pl
+    genskyvec.pl
+    ltpict.pl
+    ltview.pl
+    objpict.pl
+    objview.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 glare.csh DESTINATION bin RENAME glare)
-  install(PROGRAMS dayfact.csh DESTINATION bin RENAME dayfact)
-  install(PROGRAMS rlux.csh DESTINATION bin RENAME rlux)
-  install(PROGRAMS raddepend.csh DESTINATION bin RENAME raddepend)
-  install(PROGRAMS trad.wsh DESTINATION bin RENAME trad)
-  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)
+  install_without_extension(
+    bsdfview.pl
+    compamb.csh
+    dayfact.csh
+    fieldcomb.csh
+    genBSDF.pl
+    genambpos.csh
+    genklemsamp.pl
+    genskyvec.pl
+    glare.csh
+    ltpict.pl
+    ltview.pl
+    objline.csh
+    objpict.pl
+    objview.pl
+    raddepend.csh
+    rlux.csh
+    rtpict.pl
+    trad.wsh
+    vinfo.csh
+  )
 endif()