--- ray/src/cv/CMakeLists.txt	2017/08/19 14:16:15	1.13
+++ ray/src/cv/CMakeLists.txt	2018/01/08 16:51:32	1.14
@@ -25,23 +25,21 @@ add_executable(mgfilt mgfilt.c)
 target_link_libraries(mgfilt mgf rtrad)
 
 add_executable(mgf2inv mgf2inv.c)
-target_link_libraries(mgf2inv mgf rtrad) 
+target_link_libraries(mgf2inv mgf rtrad)
 
 add_executable(3ds2mgf 3ds2mgf.c rayopt3ds.c vect3ds.c)
-target_link_libraries(3ds2mgf rtrad) 
+target_link_libraries(3ds2mgf rtrad)
 
-if (BUILD_PABOPTO_UTILS)
-
+if(BUILD_PABOPTO_UTILS)
   add_executable(pabopto2bsdf pabopto2bsdf.c bsdfrep.c bsdfrbf.c bsdfmesh.c bsdftrans.cpp)
-  target_link_libraries(pabopto2bsdf rtrad) 
+  target_link_libraries(pabopto2bsdf rtrad)
 
   #add_executable(pabopto2xyz pabopto2xyz.c)
   #target_link_libraries(pabopto2xyz rtrad)
 
-  add_executable(pabopto2rad	pabopto2bsdf.c bsdfrep.c bsdfrbf.c bsdfmesh.c bsdftrans.cpp)
+  add_executable(pabopto2rad pabopto2bsdf.c bsdfrep.c bsdfrbf.c bsdfmesh.c bsdftrans.cpp)
   target_link_libraries(pabopto2rad rtrad)
   set_target_properties(pabopto2rad PROPERTIES COMPILE_DEFINITIONS TEST_MAIN)
-
 endif()
 
 add_executable(bsdf2rad bsdf2rad.c bsdfrep.c bsdfinterp.c)
@@ -65,19 +63,43 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../met
 add_executable(mgf2meta mgf2meta.c)
 target_link_libraries(mgf2meta mgf meta rtrad)
 
-install(TARGETS 
-	ies2rad nff2rad lampcolor tmesh2rad obj2rad 
-	mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf 
-	bsdf2ttree bsdf2klems pkgBSDF epw2wea
-  RUNTIME DESTINATION bin)
+install(TARGETS
+  3ds2mgf
+  bsdf2klems
+  bsdf2ttree
+  epw2wea
+  ies2rad
+  lampcolor
+  mgf2inv
+  mgf2meta
+  mgf2rad
+  mgfilt
+  nff2rad
+  obj2rad
+  pkgBSDF
+  rad2mgf
+  tmesh2rad
+  RUNTIME DESTINATION "bin"
+)
 
-INSTALL(FILES source.cal tilt.cal lamp.tab window.cal bsdf2rad.cal
-  DESTINATION lib)
+file(COPY
+  bsdf2rad.cal
+  lamp.tab
+  source.cal
+  tilt.cal
+  window.cal
+  DESTINATION "${CMAKE_BINARY_DIR}/lib"
+)
 
-if (NOT WIN32)
-  INSTALL(PROGRAMS optics2rad.csh DESTINATION bin RENAME optics2rad)
-  endif()
+if(NOT WIN32)
+  install(PROGRAMS optics2rad.csh
+    DESTINATION "bin"
+    RENAME optics2rad
+  )
+endif()
 
-if (BUILD_PABOPTO_UTILS)
-  INSTALL(TARGETS pabopto2rad pabopto2bsdf DESTINATION bin)
+if(BUILD_PABOPTO_UTILS)
+  install(TARGETS pabopto2bsdf pabopto2rad
+    DESTINATION "bin"
+  )
 endif()