--- ray/src/util/CMakeLists.txt	2020/08/27 17:46:52	1.40
+++ ray/src/util/CMakeLists.txt	2023/12/05 01:06:10	1.47
@@ -16,6 +16,9 @@ target_link_libraries(glarendx rtrad)
 add_executable(rad rad.c)
 target_link_libraries(rad rtrad)
 
+add_executable(rcrop rcrop.c)
+target_link_libraries(rcrop rtrad)
+
 if(WIN32)
   set(netproc_SOURCES win_netproc.c)
 else()
@@ -55,6 +58,9 @@ target_link_libraries(rcollate rtrad)
 add_executable(rmtxop rmtxop.c rmatrix.c cmbsdf.c cmatrix.c)
 target_link_libraries(rmtxop rtrad)
 
+add_executable(rmtxcomb rmtxcomb.c rmatrix.c cmbsdf.c cmatrix.c)
+target_link_libraries(rmtxcomb rtrad)
+
 add_executable(wrapBSDF wrapBSDF.c)
 target_link_libraries(wrapBSDF rtrad)
 
@@ -65,7 +71,7 @@ add_executable(rfluxmtx rfluxmtx.c)
 target_link_libraries(rfluxmtx rtrad)
 
 add_executable(evalglare evalglare.c pictool.c)
-target_link_libraries(evalglare rtrad libreetz)
+target_link_libraries(evalglare rtrad reetz)
 
 add_executable(radcompare radcompare.c)
 target_link_libraries(radcompare rtrad)
@@ -144,8 +150,10 @@ install(TARGETS
   rcode_ident
   rcode_norm
   rcollate
+  rcrop
   rfluxmtx
   rmtxop
+  rmtxcomb
   rsensor
   rttree_reduce
   vwrays
@@ -157,6 +165,7 @@ install(TARGETS
 file(COPY
   ambpos.cal
   disk2square.cal
+  hsv_rgb.cal
   klems_full.cal
   klems_half.cal
   klems_quarter.cal
@@ -202,10 +211,6 @@ if(WIN32)
   add_custom_target(rtpict ALL
     COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/rtpict.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/rtpict.exe -d
   )
-  install(FILES
-    ${CMAKE_BINARY_DIR}/bin/trad
-    DESTINATION "bin"
-  )
   install(PROGRAMS
     bsdfview.exe
     genBSDF.exe
@@ -242,7 +247,12 @@ else()
     rtpict.pl
     vinfo.csh
   )
-  add_custom_target(trad ALL
-    COMMAND csh -f ${CMAKE_CURRENT_SOURCE_DIR}/tradinstall.csh ${CMAKE_BINARY_DIR}/bin ${CMAKE_BINARY_DIR}/lib
-  )
+  # add_custom_target(trad ALL
+  #   COMMAND csh -f ${CMAKE_CURRENT_SOURCE_DIR}/tradinstall.csh ../../build/bin ../../build/lib
+  # )
+  # install(FILES
+  #   ${CMAKE_BINARY_DIR}/bin/trad
+  #   DESTINATION "bin"
+  #   PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ
+  # )
 endif()