From: Hwankyu Jhun Date: Mon, 23 Jan 2017 23:13:17 +0000 (+0900) Subject: Fix versioning X-Git-Tag: accepted/tizen/common/20170125.113419~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fappfw%2Fappcore-widget.git;a=commitdiff_plain;h=be6863152ed6d4bf9653a3fb44e98397d874cef6 Fix versioning Change-Id: I9e095901a6c52607387d86298836fcdc2c1c47da Signed-off-by: Hwankyu Jhun --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 13129fc..f295aae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,7 @@ PROJECT(appcore-widget C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") SET(INCLUDEDIR "\${prefix}/include") -SET(VERSION_MAJOR 1) -SET(VERSION "${VERSION_MAJOR}.1") +SET(VERSION ${FULLVER}) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) @@ -45,15 +44,16 @@ ENDFOREACH(flag) AUX_SOURCE_DIRECTORY(src SOURCES) ADD_LIBRARY(${APPCORE_WIDGET} SHARED ${SOURCES}) -SET_TARGET_PROPERTIES(${APPCORE_WIDGET} PROPERTIES SOVERSION ${VERSION_MAJOR}) -SET_TARGET_PROPERTIES(${APPCORE_WIDGET} PROPERTIES VERSION ${VERSION}) +SET_TARGET_PROPERTIES(${APPCORE_WIDGET} PROPERTIES SOVERSION ${MAJORVER}) +SET_TARGET_PROPERTIES(${APPCORE_WIDGET} PROPERTIES VERSION ${FULLVER}) SET_TARGET_PROPERTIES(${APPCORE_WIDGET} PROPERTIES COMPILE_FLAGS ${EXTRA_CFLAGS_widget}) TARGET_LINK_LIBRARIES(${APPCORE_WIDGET} ${pkg_widget_LDFLAGS} "-ldl -Wl,--no-undefined") +CONFIGURE_FILE(${APPCORE_WIDGET}.pc.in ${APPCORE_WIDGET}.pc @ONLY) INSTALL(TARGETS ${APPCORE_WIDGET} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPCORE_WIDGET}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/appfw/ FILES_MATCHING PATTERN "*.h" - ) \ No newline at end of file + ) diff --git a/capi-appfw-widget-application.pc b/capi-appfw-widget-application.pc.in similarity index 95% rename from capi-appfw-widget-application.pc rename to capi-appfw-widget-application.pc.in index e857f73..e1ef14d 100644 --- a/capi-appfw-widget-application.pc +++ b/capi-appfw-widget-application.pc.in @@ -7,7 +7,7 @@ includedir=@INCLUDEDIR@ Name: capi-appfw-widget-application Description: widget application library -Version: 1.1 +Version: @VERSION@ Requires: aul dlog elementary capi-appfw-app-control capi-appfw-app-common widget_service Libs: -L${libdir} -lcapi-appfw-widget-application Cflags: -I${includedir} -I${includedir}/appfw diff --git a/packaging/appcore-widget.spec b/packaging/appcore-widget.spec index 8bdedaa..a340ebe 100644 --- a/packaging/appcore-widget.spec +++ b/packaging/appcore-widget.spec @@ -59,9 +59,7 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %files %manifest appcore-widget.manifest %defattr(-,root,root,-) -%{_libdir}/libcapi-appfw-widget-application.so -%{_libdir}/libcapi-appfw-widget-application.so.1 -%{_libdir}/libcapi-appfw-widget-application.so.1.1 +%{_libdir}/libcapi-appfw-widget-application.so* /usr/share/license/%{name} %files -n capi-appfw-widget-application-devel