diff options
| author | Hwankyu Jhun <h.jhun@samsung.com> | 2017-01-19 14:33:30 +0900 |
|---|---|---|
| committer | Hwankyu Jhun <h.jhun@samsung.com> | 2017-01-19 14:33:30 +0900 |
| commit | 9c0d2eea7b131d8d9f478f60ef21a96addfe4815 (patch) | |
| tree | 501059f37d9c6e5f2f34768f6dccc868dbe81a83 | |
| parent | c23e9803aba310b78ae825484d97231fa70aa8e1 (diff) | |
| download | appcore-watch-9c0d2eea7b131d8d9f478f60ef21a96addfe4815.tar.gz appcore-watch-9c0d2eea7b131d8d9f478f60ef21a96addfe4815.tar.bz2 appcore-watch-9c0d2eea7b131d8d9f478f60ef21a96addfe4815.zip | |
Fix versioning
Change-Id: I96ec7778d6a1166815d63d5b5a29266e4de2e7f5
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | packaging/appcore-watch.spec | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f980441..a3ed0eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,6 @@ PROJECT(appcore-watch C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(VERSION_MAJOR 1) -SET(VERSION "${VERSION_MAJOR}.1") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) @@ -45,8 +43,8 @@ ENDFOREACH(flag) AUX_SOURCE_DIRECTORY(src SOURCES) ADD_LIBRARY(${APPCORE_WATCH} SHARED ${SOURCES}) -SET_TARGET_PROPERTIES(${APPCORE_WATCH} PROPERTIES SOVERSION ${VERSION_MAJOR}) -SET_TARGET_PROPERTIES(${APPCORE_WATCH} PROPERTIES VERSION ${VERSION}) +SET_TARGET_PROPERTIES(${APPCORE_WATCH} PROPERTIES SOVERSION ${MAJORVER}) +SET_TARGET_PROPERTIES(${APPCORE_WATCH} PROPERTIES VERSION ${FULLVER}) SET_TARGET_PROPERTIES(${APPCORE_WATCH} PROPERTIES COMPILE_FLAGS ${EXTRA_CFLAGS_watch}) TARGET_LINK_LIBRARIES(${APPCORE_WATCH} ${pkg_watch_LDFLAGS} "-ldl -Wl,--no-undefined") diff --git a/packaging/appcore-watch.spec b/packaging/appcore-watch.spec index 9ddaa02..6e359f5 100644 --- a/packaging/appcore-watch.spec +++ b/packaging/appcore-watch.spec @@ -52,7 +52,11 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" %endif export CFLAGS="$CFLAGS -Wall -Werror -Wno-unused-function -Wno-unused-but-set-variable" -%cmake . + +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` +%cmake -DFULLVER=%{version} \ + -DMAJORVER=${MAJORVER} \ + . make %{?jobs:-j%jobs} @@ -74,9 +78,7 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %files %manifest appcore-watch.manifest %defattr(-,root,root,-) -%{_libdir}/libappcore-watch.so -%{_libdir}/libappcore-watch.so.1 -%{_libdir}/libappcore-watch.so.1.1 +%{_libdir}/libappcore-watch.so* /usr/share/license/%{name} %files devel |