--- ray/CMakeLists.txt 2014/04/16 20:48:07 1.11 +++ ray/CMakeLists.txt 2014/08/21 19:38:23 1.13 @@ -18,12 +18,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() @@ -66,7 +66,7 @@ IF( BUILD_PACKAGE ) ENDIF( BUILD_PACKAGE ) set(CPACK_PACKAGE_VERSION_MAJOR 4) -set(CPACK_PACKAGE_VERSION_MINOR 2) +set(CPACK_PACKAGE_VERSION_MINOR 3) set(CPACK_PACKAGE_VERSION_PATCH a) set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance") SET(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")