ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/CMakeLists.txt
(Generate patch)

Comparing ray/CMakeLists.txt (file contents):
Revision 1.11 by greg, Wed Apr 16 20:48:07 2014 UTC vs.
Revision 1.13 by greg, Thu Aug 21 19:38:23 2014 UTC

# Line 18 | Line 18 | if( CPACK_NREL_SUPPORT )
18  
19    # call git log to get output containing the tag
20    execute_process(
21 <    COMMAND ${git} branch
21 >    COMMAND ${git} describe --tag --exact-match
22      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
23 <    OUTPUT_VARIABLE git_log_output)
23 >    OUTPUT_VARIABLE git_tag_output)
24  
25    # create & install the source version .txt file
26 <  file(WRITE "NREL_ver.txt" "Radiance built from source branch(*):\n ${git_log_output}")
26 >  file(WRITE "NREL_ver.txt" "Radiance version ${git_tag_output}")
27    install(FILES NREL_ver.txt DESTINATION bin/..)
28   endif()
29  
# Line 66 | Line 66 | IF( BUILD_PACKAGE )
66   ENDIF( BUILD_PACKAGE )
67  
68   set(CPACK_PACKAGE_VERSION_MAJOR 4)
69 < set(CPACK_PACKAGE_VERSION_MINOR 2)
69 > set(CPACK_PACKAGE_VERSION_MINOR 3)
70   set(CPACK_PACKAGE_VERSION_PATCH a)
71   set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
72   SET(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines