--- ray/src/util/CMakeLists.txt 2020/08/18 19:33:58 1.38 +++ ray/src/util/CMakeLists.txt 2021/10/18 16:20:21 1.42 @@ -65,7 +65,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) @@ -196,16 +196,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 +212,6 @@ if(WIN32) objpict.exe objview.exe genambpos.exe - genklemsamp.exe rcode2bmp.exe rtpict.exe DESTINATION "bin" @@ -240,7 +236,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()