Skip to content

Commit

Permalink
increased version
Browse files Browse the repository at this point in the history
use SONAME from libyui instead of VERSION.cmake
  • Loading branch information
Björn Esser committed May 6, 2013
1 parent 214693b commit a92185f
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
19 changes: 15 additions & 4 deletions CMakeLists.txt
Expand Up @@ -25,7 +25,7 @@ if (GIT_VERSION)
exec_program(
"${GIT_EXECUTABLE}"
${CMAKE_CURRENT_SOURCE_DIR}
ARGS "describe --tags"
ARGS "describe"
OUTPUT_VARIABLE GIT_VERSION )

string( REGEX MATCH "-g[0-9|a-f]+$" VERSION_SHA1 ${GIT_VERSION} )
Expand All @@ -44,18 +44,29 @@ INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.cmake" )
INITIALIZE()

PROJECT( "${PROJECTNAME}" )
ADD_DEFINITIONS(-DVERSION="${VERSION}")

INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/SOURCECONF.cmake" )

SET_OPTIONS()

IF( NOT DOCS_ONLY )
FIND_LIB_DEPENDENCIES()
FIND_LINKER_LIBS()
ENDIF( NOT DOCS_ONLY )

CHECK_PREFIX()

IF( DOCS_ONLY )
FIND_PACKAGE( Libyui REQUIRED )
SET_SONAME()
ENDIF( DOCS_ONLY )

SET_ENVIRONMENT()
SET_BUILD_FLAGS()
SET_AUTODOCS()

IF( NOT DOCS_ONLY )
FIND_LIB_DEPENDENCIES()
FIND_LINKER_LIBS()
CHECK_PREFIX()
SET_SUBDIRS()
GEN_EXPORTS()
GEN_FILES()
Expand Down
8 changes: 7 additions & 1 deletion ChangeLog
@@ -1,10 +1,16 @@
-------------------------------------------------------------------
Mon May 6 11:38:32 UTC 2013 - bjoern.esser@gmail.com

- use SONAME from libyui instead of VERSION.cmake
- V 2.43.7

-------------------------------------------------------------------
Mon May 6 10:08:01 CEST 2013 - tgoettlicher@suse.de

- fixed so version
- V 2.43.6
-------------------------------------------------------------------

-------------------------------------------------------------------
Tue Apr 30 12:49:20 CEST 2013 - gs@suse.de

- Use YSettings::localeDir() instead of LOCALEDIR (bnc #817588)
Expand Down
2 changes: 1 addition & 1 deletion VERSION.cmake
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "43" )
SET( VERSION_PATCH "6" )
SET( VERSION_PATCH "7" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )

##### This is need for the libyui core, ONLY.
Expand Down

0 comments on commit a92185f

Please sign in to comment.