--- ray/src/util/CMakeLists.txt 2020/08/27 17:46:52 1.40 +++ ray/src/util/CMakeLists.txt 2022/06/01 17:22:31 1.45 @@ -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() @@ -65,7 +68,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,6 +147,7 @@ install(TARGETS rcode_ident rcode_norm rcollate + rcrop rfluxmtx rmtxop rsensor @@ -157,6 +161,7 @@ install(TARGETS file(COPY ambpos.cal disk2square.cal + hsv_rgb.cal klems_full.cal klems_half.cal klems_quarter.cal @@ -202,10 +207,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 @@ -243,6 +244,11 @@ else() vinfo.csh ) add_custom_target(trad ALL - COMMAND csh -f ${CMAKE_CURRENT_SOURCE_DIR}/tradinstall.csh ${CMAKE_BINARY_DIR}/bin ${CMAKE_BINARY_DIR}/lib + 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()