From: chanywa Date: Fri, 25 Aug 2017 06:34:50 +0000 (+0900) Subject: Enable to be built with Mapzen plugin for Tizen Maps X-Git-Tag: accepted/tizen/unified/20170828.164235^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6dcd539dd2451b3817f1cf9c833142beb3cece64;p=platform%2Fupstream%2Ftangram-es.git Enable to be built with Mapzen plugin for Tizen Maps Change-Id: I81a78e1c2db21ec8549dc49b8c4daeaf2d65b5ca Signed-off-by: chanywa --- diff --git a/packaging/tangram-es.spec b/packaging/tangram-es.spec index f7e13b4..4dc2f9e 100644 --- a/packaging/tangram-es.spec +++ b/packaging/tangram-es.spec @@ -66,7 +66,7 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` #echo "-------------------------------->>" #find . #echo "--------------------------------<<" -cmake . -DCMAKE_BUILD_TYPE=Debug -DARCH=%{ARCH} -DPLATFORM_TARGET=tizen-lib -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} +cmake . -DCMAKE_BUILD_TYPE=Debug -DARCH=%{ARCH} -DPLATFORM_TARGET=tizen-lib -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DLIBDIR=%{_libdir} make %{?jobs:-j%jobs} %install @@ -89,3 +89,23 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %defattr(-,root,root,-) %{_libdir}/libtangram.so /usr/share/license/tangram-es + + +%package devel +Summary: Tangram-ES Map Library (Development) +Group: Location/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Tangram-ES Map Library. (Development) + +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + +%files devel +%defattr(-,root,root,-) +%{_includedir}/tangram/ +%{_libdir}/pkgconfig/tangram-es.pc \ No newline at end of file diff --git a/tangram-es.pc.in b/tangram-es.pc.in new file mode 100644 index 0000000..8cecc52 --- /dev/null +++ b/tangram-es.pc.in @@ -0,0 +1,13 @@ +#Package Information for pkg-config + +prefix=@PREFIX@ +libdir=@LIBDIR@ +includedir=@PC_INCLUDE@ + +Name: @PC_NAME@ +Description: @PC_DESCRIPTION@ +Version: @VERSION@ +Requires: @PC_REQUIRED@ +Libs: -L${libdir} @PC_LDFLAGS@ +Cflags: -I${includedir} @PC_CFLAGS@ + diff --git a/toolchains/tizen-lib.cmake b/toolchains/tizen-lib.cmake index 007d0c9..1685c8e 100644 --- a/toolchains/tizen-lib.cmake +++ b/toolchains/tizen-lib.cmake @@ -1,3 +1,8 @@ +SET(fw_name "tangram-es") +SET(CMAKE_INSTALL_PREFIX /usr) +SET(PREFIX ${CMAKE_INSTALL_PREFIX}) + + # set for test in other cmake files set(PLATFORM_TIZEN ON) @@ -80,9 +85,29 @@ target_compile_options(${LIB_NAME} -fPIC -Wl,-z,defs) - -if (${ARCH} MATCHES "x86_64" OR ${ARCH} MATCHES "aarch64") -install(TARGETS ${LIB_NAME} DESTINATION lib64) -else () -install(TARGETS ${LIB_NAME} DESTINATION lib) -endif() +# pkgconfig +SET(PC_NAME ${fw_name}) +SET(PC_DESCRIPTION "Tizen mapzen plugin Library") +SET(PC_LDFLAGS -l${LIB_NAME}) +SET(PC_INCLUDE /usr/include/tangram) +CONFIGURE_FILE(${fw_name}.pc.in + ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc + @ONLY ) + +# install library +install(TARGETS ${LIB_NAME} DESTINATION ${LIBDIR}) + +# install pkgconfig +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIBDIR}/pkgconfig) + +# install header files +SET(INC_DIR + core/include/tangram/ + platforms/tizen/src + platforms/common +) +INCLUDE_DIRECTORIES(${INC_DIR}) +INSTALL( DIRECTORY ${INC_DIR}/ DESTINATION /usr/include/tangram + FILES_MATCHING + PATTERN "*.h" +)