[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [oxygen-gtk] /: Merge branch '1.1'
From:       Ruslan Kabatsayev <b7.10110111 () gmail ! com>
Date:       2011-08-18 18:35:22
Message-ID: 20110818183522.1B442A60C9 () git ! kde ! org
[Download RAW message or body]

Git commit 05a4bae00e3c652ed9779dee57b33f5e178e6638 by Ruslan Kabatsayev.
Committed on 18/08/2011 at 20:32.
Pushed by kabatsayev into branch 'master'.

Merge branch '1.1'

M  +23   -13   CMakeLists.txt

http://commits.kde.org/oxygen-gtk/05a4bae00e3c652ed9779dee57b33f5e178e6638

diff --cc CMakeLists.txt
index e26fa6c,16b5fbd..f058c87
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -13,9 -13,20 +13,20 @@@ set( CPACK_PACKAGE_DESCRIPTION_SUMMARY 
  set( CPACK_PACKAGE_VENDOR "hugo@oxygen-icons.org" )
  set( CPACK_PACKAGE_VERSION_MAJOR "1" )
  set( CPACK_PACKAGE_VERSION_MINOR "1" )
 -set( CPACK_PACKAGE_VERSION_PATCH "2" )
 +set( CPACK_PACKAGE_VERSION_PATCH "50" )
  set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" )
  
+ ##################################
+ # Define oxygen-gtk version string
+ ##################################
+ if( EXISTS "${CMAKE_SOURCE_DIR}/.git" )
+   execute_process(COMMAND git describe
+     OUTPUT_VARIABLE OXYGEN_VERSION
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+ else( EXISTS "${CMAKE_SOURCE_DIR}/.git" )
+   set( OXYGEN_VERSION \
${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} \
) + endif( EXISTS "${CMAKE_SOURCE_DIR}/.git" )
+ 
  set( CPACK_SOURCE_PACKAGE_FILE_NAME \
"oxygen-gtk-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}" \
)  include( CPack )
  ########################


[prev in list] [next in list] [prev in thread] [next in thread]