From a492b54ce4b566f5cbae93b7198cb54653dde6d6 Mon Sep 17 00:00:00 2001 From: taesubkim Date: Fri, 13 May 2016 16:33:36 +0900 Subject: [PATCH] Modified build option naming rule Change-Id: Ia04cf1a5d374d0aac39d4945a232b32542485ec9 Signed-off-by: Taesub Kim --- CMakeLists.txt | 9 --------- packaging/capi-vpn-service.spec | 19 +++---------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b60293d..ee997cb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,15 +24,6 @@ ADD_DEFINITIONS("-fPIC") # ADD_DEFINITIONS("-Werror") # Make all warnings into errors. ADD_DEFINITIONS("-Wall") # Generate all warnings -STRING(REGEX MATCH "([^.]*)" API_VERSION "${VERSION}") -ADD_DEFINITIONS("-DAPI_VERSION=\"$(API_VERSION)\"") -ADD_DEFINITIONS("-DSMACK_ENABLED") - -IF (CMAKE_BUILD_TYPE MATCHES "DEBUG") - ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE") - ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG") -ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG") - ADD_SUBDIRECTORY(framework) ADD_SUBDIRECTORY(daemon) ADD_SUBDIRECTORY(test) diff --git a/packaging/capi-vpn-service.spec b/packaging/capi-vpn-service.spec index 9e3b66d..f30b897 100755 --- a/packaging/capi-vpn-service.spec +++ b/packaging/capi-vpn-service.spec @@ -1,6 +1,6 @@ Name: vpnsvc-pkg Summary: VPN service library in TIZEN C API -Version: 1.0.15 +Version: 1.0.16 Release: 1 Group: System/Network License: Apache-2.0 @@ -65,26 +65,13 @@ vpnsvc daemon package %setup -q %build -%if 0%{?sec_build_binary_debug_enable} -export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" -export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" -export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" -%endif - -%if 0%{?tizen_build_binary_release_type_eng} -export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE" -export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE" -export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE" -%endif - export LDFLAGS+="-Wl,--rpath=%{_libdir}" MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %cmake . -DVERSION=%{version} \ - -DFULLVER=%{version} \ - -DMAJORVER=${MAJORVER} \ + -DFULLVER=%{version} \ + -DMAJORVER=${MAJORVER} \ -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \ - -DTIZEN_ENGINEER_MODE=%{?tizen_build_binary_release_type_eng:1}%{!?tizen_build_binary_release_type_eng:0} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DLIB_INSTALL_DIR=%{_libdir} -- 2.7.4