diff options
| author | Sangyoon Jang <s89.jang@samsung.com> | 2015-12-23 13:48:26 +0900 |
|---|---|---|
| committer | Sangyoon Jang <s89.jang@samsung.com> | 2016-01-05 10:02:02 +0900 |
| commit | 2db5dfea9b110be12e23e52b9eeab1b25596b35a (patch) | |
| tree | 19d74629b25a771a32405dc0a2573af278d9dce0 | |
| parent | 50c09d28fbe1b37f15558307b12a97ff3a9d30bb (diff) | |
| download | widget-service-2db5dfea9b110be12e23e52b9eeab1b25596b35a.tar.gz widget-service-2db5dfea9b110be12e23e52b9eeab1b25596b35a.tar.bz2 widget-service-2db5dfea9b110be12e23e52b9eeab1b25596b35a.zip | |
Fix library versioning
use version of rpm project
Change-Id: I65d76f8c3f731c2446327e4003d821e1fa850048
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | packaging/libwidget_service.spec | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b4bf037..eb22c80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,6 @@ SET(EXEC_PREFIX "\${prefix}") SET(PROJECT_NAME "${PROJECT_NAME}") SET(LIBDIR ${LIB_INSTALL_DIR}) SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") -SET(VERSION_MAJOR 1) -SET(VERSION "${VERSION_MAJOR}.0.0") set(CMAKE_SKIP_BUILD_RPATH true) @@ -95,8 +93,8 @@ ENDIF (WAYLAND_SUPPORT) ADD_LIBRARY(${PROJECT_NAME} SHARED ${BUILD_SOURCE}) -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR}) -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) +SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${MAJORVER}) +SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${FULLVER}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} ${pkg_extra_LDFLAGS}) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/packaging/libwidget_service.spec b/packaging/libwidget_service.spec index 73f37f8..b7b2676 100644 --- a/packaging/libwidget_service.spec +++ b/packaging/libwidget_service.spec @@ -84,7 +84,9 @@ export X11_SUPPORT=On sqlite3 .widget.db < ./parser/widget.sql -%cmake . -DWAYLAND_SUPPORT=${WAYLAND_SUPPORT} -DX11_SUPPORT=${X11_SUPPORT} +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` +%cmake . -DWAYLAND_SUPPORT=${WAYLAND_SUPPORT} -DX11_SUPPORT=${X11_SUPPORT} \ + -DFULLVER=%{version} -DMAJORVER=${MAJORVER} make %{?jobs:-j%jobs} %install |