--- ray/src/CMakeLists.txt	2016/02/03 22:54:01	1.5
+++ ray/src/CMakeLists.txt	2018/01/08 16:51:32	1.7
@@ -4,7 +4,7 @@ if(UNIX)
     message(FATAL_ERROR "Cannot build radiance without libm.  Please set LIB_M")
   endif()
 else()
-  set(LIB_M )
+  set(LIB_M)
 endif()
 
 include_directories(common)
@@ -13,12 +13,33 @@ macro(create_version_file version_file)
   add_custom_command(
     OUTPUT "${version_file}"
     COMMAND "${CMAKE_COMMAND}"
-    -DVERSION_OUT_FILE="${version_file}"
-    -DVERSION_IN_FILE="${radiance_SOURCE_DIR}/src/rt/VERSION"
-    -DVERSION_GOLD="${radiance_SOURCE_DIR}/src/rt/Version.c"
-    -P "${radiance_SOURCE_DIR}/src/rt/create_version.cmake"
+      -DRADIANCE_VERSION="${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}"
+      -DVERSION_OUT_FILE="${version_file}"
+      -DVERSION_IN_FILE="${radiance_SOURCE_DIR}/src/rt/VERSION"
+      -DVERSION_GOLD="${radiance_SOURCE_DIR}/src/rt/Version.c"
+      -P "${radiance_SOURCE_DIR}/src/rt/create_version.cmake"
+  )
+endmacro()
+macro(install_without_extension)
+  foreach(file IN ITEMS ${ARGN})
+    string(REGEX REPLACE "\\.[^.]*$" "" file_we ${file})
+    install(PROGRAMS "${file}"
+      DESTINATION "bin"
+      RENAME "${file_we}"
     )
+  endforeach()
 endmacro()
+macro(install_and_copy_without_extension)
+  foreach(file IN ITEMS ${ARGN})
+    string(REGEX REPLACE "\\.[^.]*$" "" file_we ${file})
+    install(PROGRAMS "${file}"
+      DESTINATION "bin"
+      RENAME ${file_we}
+    )
+    file(COPY "${file}" DESTINATION "${CMAKE_BINARY_DIR}/bin")
+    file(RENAME "${CMAKE_BINARY_DIR}/bin/${file}" "${CMAKE_BINARY_DIR}/bin/${file_we}")
+  endforeach()
+endmacro()
 add_subdirectory(common)
 add_subdirectory(cal)
 add_subdirectory(cv)
@@ -29,8 +50,7 @@ add_subdirectory(ot)
 add_subdirectory(px)
 add_subdirectory(rt)
 add_subdirectory(util)
-# only use qtrvu if qt5 is found
-if(Qt5Widgets_DIR)
+if(NOT BUILD_HEADLESS AND Qt5Widgets_DIR)
+  # only use qtrvu if qt5 is found
   add_subdirectory(qtrvu)
 endif()
-