From 029f2cd9a25122d3e86c5a6859d044d0f162f14a Mon Sep 17 00:00:00 2001 From: Hyunwoo Kim Date: Thu, 26 Sep 2013 15:33:01 +0900 Subject: [PATCH] Modify CMake file for using pkgconfig Change-Id: Iccf35178132c2930fe0909c97a0e944546e5659f Signed-off-by: Hyunwoo Kim --- CMakeLists.txt | 8 +++++--- LICENSE.APLv2 => LICENSE | 0 packaging/osp-secure-element.spec | 20 +++++++++++--------- 3 files changed, 16 insertions(+), 12 deletions(-) rename LICENSE.APLv2 => LICENSE (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e26b723..6863e60 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,10 +2,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET (this_target osp-secure-element) +INCLUDE(FindPkgConfig) +pkg_check_modules(${this_target} REQUIRED osp-appfw smartcard-service smartcard-service-common) + SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/cmake_build_tmp/output) INCLUDE_DIRECTORIES( ${SLP_INCLUDE_DIRS} + ${${this_target}_INCLUDE_DIRS}} inc src src/inc @@ -61,9 +65,7 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES}) ## SET LINKER FLAGS SET(CMAKE_SHARED_LINKER_FLAGS -Wl,--no-undefined) -TARGET_LINK_LIBRARIES(${this_target} "-lsmartcard-service" ) -TARGET_LINK_LIBRARIES(${this_target} "-lsmartcard-service-common" ) -TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw" ) +TARGET_LINK_LIBRARIES(${this_target} ${${this_target}_LDFLAGS} ${${this_target}_LIBRARIES} ) SET_TARGET_PROPERTIES(${this_target} PROPERTIES diff --git a/LICENSE.APLv2 b/LICENSE similarity index 100% rename from LICENSE.APLv2 rename to LICENSE diff --git a/packaging/osp-secure-element.spec b/packaging/osp-secure-element.spec index b5ac04f..4f1a3ba 100644 --- a/packaging/osp-secure-element.spec +++ b/packaging/osp-secure-element.spec @@ -42,25 +42,27 @@ cp %{SOURCE1001} . MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %ifarch %{ix86} %if 0%{?simulator} -CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" %else -CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ " cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ " %endif %else -CXXFLAGS="-O2 -g -pipe -Wall -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +CXXFLAGS="-O2 -g -pipe -Wall -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_" %endif -# Call make instruction with smp support -#make %{?jobs:-j%jobs} -make %{?_smp_mflags} +%if 0%{?tizen_build_binary_release_type_eng} +CXXFLAGS="$CXXFLAGS -D_SECURE_LOG" +%endif -%clean -rm -rf %{buildroot} +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} + +# Call make instruction with smp support +make %{?jobs:-j%jobs} %install rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/license -cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{name} +cp LICENSE %{buildroot}/usr/share/license/%{name} %make_install -- 2.7.4