diff options
| -rwxr-xr-x | CMakeLists.txt | 23 | ||||
| -rwxr-xr-x | packaging/osp-locations.spec | 16 |
2 files changed, 6 insertions, 33 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9697a40..881c9cd 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,29 +49,16 @@ TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-uifw") TARGET_LINK_LIBRARIES(${this_target} "-lcapi-location-manager") TARGET_LINK_LIBRARIES(${this_target} "-lpthread") -SET_TARGET_PROPERTIES(${this_target} - PROPERTIES +SET_TARGET_PROPERTIES(${this_target} + PROPERTIES VERSION ${FULLVER} SOVERSION ${MAJORVER} CLEAN_DIRECT_OUTPUT 1 ) -ADD_CUSTOM_COMMAND(TARGET ${this_target} - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${MAJORVER} - COMMAND ${CMAKE_STRIP} --strip-unneeded ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} - COMMENT "strip ${this_target}" - ) - -INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp - FILES_MATCHING PATTERN "*.so*" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ) -INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/debug - FILES_MATCHING PATTERN "*.so*" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ +INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp + FILES_MATCHING PATTERN "*.so*" + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/packaging/osp-locations.spec b/packaging/osp-locations.spec index 091dc43..6667810 100755 --- a/packaging/osp-locations.spec +++ b/packaging/osp-locations.spec @@ -1,6 +1,3 @@ -%define debug_package %{nil} -%define __strip /bin/true - Name: osp-locations Summary: osp locations library Version: 1.2.1.0 @@ -38,18 +35,10 @@ Requires: %{name} = %{version}-%{release} %description internal-devel osp locations library (Internal-DEV) -%package debug -Summary: osp locations library (Development) -Group: TO_BE/FILLED_IN -Requires: %{name} = %{version}-%{release} - -%description debug -osp locations library (DEV) - %prep %setup -q -%build +%build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %ifarch %{ix86} CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} @@ -80,6 +69,3 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license %{_libdir}/pkgconfig/osp-locations.pc %files internal-devel - -%files debug -%{_libdir}/osp/debug/*.so* |