diff options
| author | Hwankyu Jhun <h.jhun@samsung.com> | 2017-01-24 07:58:10 +0900 |
|---|---|---|
| committer | Hwankyu Jhun <h.jhun@samsung.com> | 2017-01-24 07:58:10 +0900 |
| commit | 546a36fb7b3153e33484621c5e95a4e4ba31859e (patch) | |
| tree | 168f9ad41084b473683e4710d46df664ffe3e57f | |
| parent | 51a5f2cc0d9b1b07cda190e787fc61b37139222d (diff) | |
| download | launchpad-546a36fb7b3153e33484621c5e95a4e4ba31859e.tar.gz launchpad-546a36fb7b3153e33484621c5e95a4e4ba31859e.tar.bz2 launchpad-546a36fb7b3153e33484621c5e95a4e4ba31859e.zip | |
Fix versioning
Change-Id: I5acf92bcbb9d94d415cbe5f2f09f701503d11d53
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
| -rwxr-xr-x | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | packaging/launchpad.spec | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 15735c7..e0c208f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET (this_target_pool launchpad_pool) SET (this_target_loader launchpad_loader) SET (this_target_lib launchpad) -SET (VERSION_MAJOR 0) INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(${this_target_pool} REQUIRED @@ -126,7 +125,7 @@ ADD_LIBRARY(${LAUNCHPAD_LIB} SHARED src/launchpad_lib.c src/launchpad_common.c ) -SET_TARGET_PROPERTIES(${LAUNCHPAD_LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) +SET_TARGET_PROPERTIES(${LAUNCHPAD_LIB} PROPERTIES SOVERSION ${MAJORVER}) SET_TARGET_PROPERTIES(${LAUNCHPAD_LIB} PROPERTIES VERSION ${VERSION}) SET_TARGET_PROPERTIES(${LAUNCHPAD_LIB} PROPERTIES COMPILE_FLAGS ${EXTRA_CFLAGS_lib}) TARGET_LINK_LIBRARIES(${LAUNCHPAD_LIB} ${${this_target_lib}_LDFLAGS} "-ldl") diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index 7c50db3..b3da97e 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -55,7 +55,9 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" _APPFW_FEATURE_PRIORITY_CHANGE=ON %endif +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %cmake -DVERSION=%{version} \ + -DMAJORVER=${MAJORVER} \ -D_APPFW_FEATURE_PRIORITY_CHANGE:BOOL=${_APPFW_FEATURE_PRIORITY_CHANGE} \ . %__make %{?_smp_mflags} |