--- ray/CMakeLists.txt	2014/03/20 22:49:21	1.9
+++ ray/CMakeLists.txt	2014/04/16 20:48:07	1.11
@@ -7,22 +7,45 @@ include(CTest)
 option(BUILD_SHARED_LIBS "Build radiance using shared libraries?" OFF)
 option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
 
+option(CPACK_NREL_SUPPORT "Include OpenStudio ToolFinder Help?" OFF)
+
+if( CPACK_NREL_SUPPORT )
+  # find git so we can query for the current git tag
+  find_program(git git)
+  if (NOT git)
+    message(ERROR "Please specify the path to the git executable")
+  endif()
+
+  # call git log to get output containing the tag
+  execute_process(
+    COMMAND ${git} branch
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE git_log_output)
+
+  # create & install the source version .txt file
+  file(WRITE "NREL_ver.txt" "Radiance built from source branch(*):\n ${git_log_output}")
+  install(FILES NREL_ver.txt DESTINATION bin/..)
+endif()
+ 
 if(NOT WIN32)
   set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
   install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/man/ DESTINATION man)
   set(qt_plugin_term "PLUGIN")
 endif()
 
-
 if (WIN32)
-
-  set(CPACK_NSIS_MODIFY_PATH 0)
-
-  set(CPACK_BINARY_ZIP 1)
-
-  set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "")
+  set(CPACK_NSIS_MODIFY_PATH 1)
   set(qt_plugin_term "LIBRARY")
 
+  # Set RAYPATH on install
+  set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
+    "WriteRegExpandStr HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" RAYPATH '\\\$INSTDIR\\\\lib\\\;.'"
+  )
+
+  # Unset RAYPATH on uninstall
+  set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
+    "DeleteRegValue HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" RAYPATH"
+  )
 endif()
 
 if(UNIX)