--- ray/src/util/CMakeLists.txt 2020/08/18 19:33:58 1.38 +++ ray/src/util/CMakeLists.txt 2025/04/19 17:12:59 1.51 @@ -1,7 +1,7 @@ set(VERSION_FILE "${radiance_BINARY_DIR}/src/util/Version.c") create_version_file("${VERSION_FILE}") -add_executable(dctimestep dctimestep.c cmbsdf.c cmatrix.c) +add_executable(dctimestep dctimestep.c cmbsdf.c cmconst.c cmatrix.c) target_link_libraries(dctimestep rtrad) add_executable(findglare findglare.c glareval.c glaresrc.c setscan.c) @@ -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() @@ -34,7 +37,7 @@ 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) +add_executable(dcglare dcglare.c cmbsdf.c cmconst.c cmatrix.c cmglare.c) target_link_libraries(dcglare rtrad) #the next few libraries all need to include header files from the rt directory @@ -52,9 +55,15 @@ 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) +add_executable(rmtxop rmtxop.c rmatrix.c cmconst.c cmbsdf.c cmatrix.c) target_link_libraries(rmtxop rtrad) +add_executable(rcomb rcomb.c cmconst.c rmatrix.c cmatrix.c) +target_link_libraries(rcomb rtrad) + +add_executable(pvsum pvsum.c cmconst.c rmatrix.c cmatrix.c) +target_link_libraries(pvsum rtrad) + add_executable(wrapBSDF wrapBSDF.c) target_link_libraries(wrapBSDF rtrad) @@ -65,7 +74,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 +153,10 @@ install(TARGETS rcode_ident rcode_norm rcollate + rcrop rfluxmtx rmtxop + rcomb rsensor rttree_reduce vwrays @@ -157,6 +168,7 @@ install(TARGETS file(COPY ambpos.cal disk2square.cal + hsv_rgb.cal klems_full.cal klems_half.cal klems_quarter.cal @@ -196,16 +208,13 @@ if(WIN32) add_custom_target(genambpos ALL COMMAND pp ${CMAKE_CURRENT_SOURCE_DIR}/genambpos.pl -o ${CMAKE_CURRENT_SOURCE_DIR}/genambpos.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(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 + install(PROGRAMS bsdfview.exe genBSDF.exe genklemsamp.exe @@ -215,7 +224,6 @@ if(WIN32) objpict.exe objview.exe genambpos.exe - genklemsamp.exe rcode2bmp.exe rtpict.exe DESTINATION "bin" @@ -240,7 +248,14 @@ else() rcode2bmp.pl rlux.csh rtpict.pl - trad.wsh vinfo.csh ) + # 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()