summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiwoong Im <jiwoong.im@samsung.com>2017-03-27 09:32:33 (GMT)
committerJiwoong Im <jiwoong.im@samsung.com>2017-03-27 10:35:12 (GMT)
commit8c41cbf1ab0f3854dd26d3741701adfdc84c9e45 (patch)
tree77f0bedc5becec1584a07197aaf70f86643edf4d
parentfc03b71394fd57bc1ca12d3391c18a66f82abaee (diff)
downloadui-gadget-1-accepted/tizen_common.zip
ui-gadget-1-accepted/tizen_common.tar.gz
ui-gadget-1-accepted/tizen_common.tar.bz2
Changes: - Set license using %license macro Change-Id: I6a81d25b919568de0075f9a240e8a3bf4c88c652 Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>
-rw-r--r--CMakeLists.txt6
-rw-r--r--packaging/ui-gadget-1.spec5
-rw-r--r--ug-efl-engine/CMakeLists.txt6
3 files changed, 7 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25ca50f..eb774bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,6 @@ PROJECT(ui-gadget-1)
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION_MAJOR 0)
-SET(VERSION "${VERSION_MAJOR}.1.0")
SET(CMAKE_SKIP_BUILD_RPATH TRUE)
@@ -41,8 +39,8 @@ ENDFOREACH(flag)
SET(CFLAGS "${CFLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}/include")
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${CFLAGS}")
-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} -ldl)
CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
diff --git a/packaging/ui-gadget-1.spec b/packaging/ui-gadget-1.spec
index a4cf1e9..32676e7 100644
--- a/packaging/ui-gadget-1.spec
+++ b/packaging/ui-gadget-1.spec
@@ -3,7 +3,7 @@
Name: ui-gadget-1
Summary: UI Gadget Library
-Version: 0.1.30
+Version: 0.1.31
Release: 1
Group: System/Libraries
License: Apache-2.0
@@ -48,7 +48,8 @@ Development files for %{name}
cp %{SOURCE1001} .
%build
-%cmake . \
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \
-DTZ_SYS_ETC=%TZ_SYS_ETC \
%if %{with wayland} && !%{with x}
-Dwith_wayland=TRUE
diff --git a/ug-efl-engine/CMakeLists.txt b/ug-efl-engine/CMakeLists.txt
index 6005fa5..cff47ad 100644
--- a/ug-efl-engine/CMakeLists.txt
+++ b/ug-efl-engine/CMakeLists.txt
@@ -1,8 +1,6 @@
SET(UG_EFL_ENGINE "${PROJECT_NAME}-efl-engine")
SET(UG_EFL_ENGINE_SRCS ug-efl-engine.c)
SET(UG_ENGINE_EDJ_DIR "${CMAKE_INSTALL_PREFIX}/share/edje")
-SET(VERSION_MAJOR 0)
-SET(VERSION "${VERSION_MAJOR}.1.0")
SET(UG_EFL_ENGINE_PKGS_CHECK_MODULES "dlog elementary ecore edje capi-appfw-application evas")
IF (with_x)
@@ -22,8 +20,8 @@ ENDFOREACH(flag)
SET(UG_EFL_ENGINE_CFLAGS, "${UG_EFL_ENGINE_CFLAGS} -DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
ADD_LIBRARY(${UG_EFL_ENGINE} SHARED ${UG_EFL_ENGINE_SRCS})
-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})
SET_TARGET_PROPERTIES(${UG_EFL_ENGINE} PROPERTIES COMPILE_FLAGS "${UG_EFL_ENGINE_CFLAGS}")
TARGET_LINK_LIBRARIES(${UG_EFL_ENGINE} ${PROJECT_NAME} ${UG_EFL_ENGINE_PKGS_LDFLAGS})