--- ray/CMakeLists.txt	2014/04/16 20:48:07	1.11
+++ ray/CMakeLists.txt	2017/08/19 14:16:15	1.18
@@ -1,11 +1,22 @@
 cmake_minimum_required(VERSION 2.8.4)
 project("radiance")
 
+if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.11")
+  cmake_policy(SET CMP0020 NEW)
+  if(NOT ${CMAKE_VERSION} VERSION_LESS "3.0")
+    cmake_policy(SET CMP0042 NEW)
+    if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
+      cmake_policy(SET CMP0054 NEW)
+    endif()
+  endif()
+endif()
+
 enable_testing()
 include(CTest)
 
 option(BUILD_SHARED_LIBS "Build radiance using shared libraries?" OFF)
 option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
+option(BUILD_PABOPTO_UTILS "Build PABOpto Utilities?" OFF)
 
 option(CPACK_NREL_SUPPORT "Include OpenStudio ToolFinder Help?" OFF)
 
@@ -18,12 +29,12 @@ if( CPACK_NREL_SUPPORT )
 
   # call git log to get output containing the tag
   execute_process(
-    COMMAND ${git} branch
+    COMMAND ${git} describe --tag --exact-match
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE git_log_output)
+    OUTPUT_VARIABLE git_tag_output)
 
   # create & install the source version .txt file
-  file(WRITE "NREL_ver.txt" "Radiance built from source branch(*):\n ${git_log_output}")
+  file(WRITE "NREL_ver.txt" "Radiance version ${git_tag_output}")
   install(FILES NREL_ver.txt DESTINATION bin/..)
 endif()
  
@@ -65,9 +76,9 @@ IF( BUILD_PACKAGE )
   INCLUDE(radianceCPack.cmake )
 ENDIF( BUILD_PACKAGE )
 
-set(CPACK_PACKAGE_VERSION_MAJOR 4)
-set(CPACK_PACKAGE_VERSION_MINOR 2)
-set(CPACK_PACKAGE_VERSION_PATCH a)
+set(CPACK_PACKAGE_VERSION_MAJOR 5)
+set(CPACK_PACKAGE_VERSION_MINOR 1)
+set(CPACK_PACKAGE_VERSION_PATCH 0)
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
 SET(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
 SET(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")
@@ -77,7 +88,7 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR
 include(CPack)
 
 if(NOT BUILD_HEADLESS)
-  find_package(Qt4 COMPONENTS QtCore QtGui)
+  find_package(Qt5Widgets)
   find_package(X11)
 endif()