--- ray/src/util/CMakeLists.txt	2018/03/20 17:53:48	1.26
+++ ray/src/util/CMakeLists.txt	2020/08/20 03:37:10	1.39
@@ -34,6 +34,9 @@ target_link_libraries(vwrays rtrad)
 add_executable(vwright vwright.c)
 target_link_libraries(vwright rtrad)
 
+add_executable(dcglare dcglare.c cmbsdf.c cmatrix.c cmglare.c)
+target_link_libraries(dcglare rtrad)
+
 #the next few libraries all need to include header files from the rt directory
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../rt")
 
@@ -64,6 +67,18 @@ 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)
+target_link_libraries(rcode_depth rtrad)
+
+add_executable(rcode_norm rcode_norm.c)
+target_link_libraries(rcode_norm rtrad)
+
+add_executable(rcode_ident rcode_ident.c)
+target_link_libraries(rcode_ident rtrad)
+
 if(X11_FOUND)
   add_executable(xglaresrc
     xglaresrc.c
@@ -79,11 +94,11 @@ endif()
 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()
@@ -114,6 +129,7 @@ if(UNIX)
 endif()
 
 install(TARGETS
+  dcglare
   dctimestep
   eplus_adduvf
   evalglare
@@ -121,8 +137,12 @@ install(TARGETS
   getinfo
   glarendx
   rad
+  radcompare
   ranimate
   ranimove
+  rcode_depth
+  rcode_ident
+  rcode_norm
   rcollate
   rfluxmtx
   rmtxop
@@ -149,16 +169,51 @@ file(COPY
 )
 
 if(WIN32)
-  install(PROGRAMS
-    bsdfview.pl
-    genBSDF.pl
-    genklemsamp.pl
-    genskyvec.pl
-    ltpict.pl
-    ltview.pl
-    objpict.pl
-    objview.pl
-    rtpict.pl
+   add_custom_target(bsdfview ALL
+    COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/bsdfview.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/bsdfview.exe -d
+  )
+  add_custom_target(genBSDF ALL
+    COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/genBSDF.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/genBSDF.exe -d
+  )
+  add_custom_target(genklemsamp ALL
+    COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/genklemsamp.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/genklemsamp.exe -d
+  )
+  add_custom_target(genskyvec ALL
+    COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/genskyvec.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/genskyvec.exe -d
+  )
+  add_custom_target(ltpict ALL
+    COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/ltpict.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/ltpict.exe -d
+  )
+  add_custom_target(ltview ALL
+    COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/ltview.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/ltview.exe -d
+  )
+  add_custom_target(objpict ALL
+    COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/objpict.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/objpict.exe -d
+  )
+  add_custom_target(objview ALL
+    COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/objview.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/objview.exe -d
+  )
+  add_custom_target(genambpos ALL
+    COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/genambpos.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/genambpos.exe -d
+  )
+  add_custom_target(rcode2bmp ALL
+    COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/rcode2bmp.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/rcode2bmp.exe -d
+  )
+  add_custom_target(rtpict ALL
+    COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/rtpict.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/rtpict.exe -d
+  )
+ install(PROGRAMS
+    bsdfview.exe
+    genBSDF.exe
+    genklemsamp.exe
+    genskyvec.exe
+    ltpict.exe
+    ltview.exe
+    objpict.exe
+    objview.exe
+    genambpos.exe
+    rcode2bmp.exe
+    rtpict.exe
     DESTINATION "bin"
   )
 else()
@@ -168,7 +223,7 @@ else()
     dayfact.csh
     fieldcomb.csh
     genBSDF.pl
-    genambpos.csh
+    genambpos.pl
     genklemsamp.pl
     genskyvec.pl
     glare.csh
@@ -178,9 +233,14 @@ else()
     objpict.pl
     objview.pl
     raddepend.csh
+    rcode2bmp.pl
     rlux.csh
     rtpict.pl
-    trad.wsh
     vinfo.csh
+  )
+  add_custom_target(trad ALL
+    COMMAND csh -f  ${CMAKE_CURRENT_SOURCE_DIR}/tradinstall.csh
+	RUNTIME DESTINATION "bin"
+	${CMAKE_BINARY_DIR}/lib
   )
 endif()