Clean-up build flag

[Issue#]   N/A
[Problem]  Unused build flag is added.
[Cause]    wrt-setting menu isn't managed quite long time.
           As new UX is confirmed and setting menu is reopened,
           wrt-setting needs to clean-up and refactoring.
[Solution] Update build flag
           - Remove C11 build flag("-std=c+0x").
             This build flag duplicated with build defined by CMAKE_CXX_FLAGS.
           - Remove "-DUG_INSTALL_PREFIX=/usr".
             It isn't usefull to use with predefined.
             Moreover it isn't dependent with platform build define
[SCMRequest] N/A

Conflicts:
	CMakeLists.txt
	packaging/wrt-setting.spec

Change-Id: I220568b9a008a57384e4df174675d47de8e18d9b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea240ba..7ec5312 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,10 +16,18 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 INCLUDE(FindPkgConfig)
-ADD_DEFINITIONS("-std=c++0x")
 ADD_DEFINITIONS("-Wall")   # Generate all warnings
 ADD_DEFINITIONS("-Wextra") # Generate even more extra warnings
 
+# BUILD FLAGS
+SET(CMAKE_BUILD_TYPE           "Release")
+SET(CMAKE_C_FLAGS_PROFILING    "-O0 -g -pg")
+SET(CMAKE_CXX_FLAGS_PROFILING  "-O0 -std=c++0x -g -pg")
+SET(CMAKE_C_FLAGS_DEBUG        "-O0 -g")
+SET(CMAKE_CXX_FLAGS_DEBUG      "-O0 -std=c++0x -g")
+SET(CMAKE_C_FLAGS_RELEASE      "-O2 -g")
+SET(CMAKE_CXX_FLAGS_RELEASE    "-O2 -std=c++0x -g")
+
 ADD_SUBDIRECTORY(webapp-detail)
 ADD_SUBDIRECTORY(po)
 ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALE_DIR}\"")

diff --git a/packaging/wrt-setting.spec b/packaging/wrt-setting.spec
index 399e66a..8fb242a 100755 (executable)
--- a/packaging/wrt-setting.spec
+++ b/packaging/wrt-setting.spec
@@ -8,6 +8,7 @@ Source0: %{name}-%{version}.tar.gz
 
 BuildRequires: gettext
 BuildRequires: cmake
+BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(ui-gadget-1)
@@ -22,9 +23,16 @@ WRT Setting UI Gadgets
 
 %prep
 %setup -q
-%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DUG_INSTALL_PREFIX=/usr -DPROJECT_API_VERSION=0 -DPROJECT_VERSION=%{version}
 
 %build
+%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=/usr/lib"
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DPROJECT_VERSION=%{version} -DPROJECT_API_VERSION=%{version}
 make %{?jobs:-j%jobs}
 
 %install

diff --git a/webapp-detail/CMakeLists.txt b/webapp-detail/CMakeLists.txt
index aa60841..d9d0e7c 100755 (executable)
--- a/webapp-detail/CMakeLists.txt
+++ b/webapp-detail/CMakeLists.txt
@@ -16,18 +16,10 @@
 
 SET(TARGET_UG_DETAIL_LIB "ug-webapp-detail-efl")
 SET(TARGET_UG_EDJ "webapp-detail.edj")
-SET(UGDIR "${UG_INSTALL_PREFIX}/ug/lib")
-
-# Compiler flags
-SET(CMAKE_BUILD_TYPE           "Release")
-SET(CMAKE_C_FLAGS_PROFILING    "-O0 -g -pg")
-SET(CMAKE_CXX_FLAGS_PROFILING  "-O0 -std=c++0x -g -pg")
-SET(CMAKE_C_FLAGS_DEBUG        "-O0 -g")
-SET(CMAKE_CXX_FLAGS_DEBUG      "-O0 -std=c++0x -g")
-SET(CMAKE_C_FLAGS_RELEASE      "-O2 -g")
-SET(CMAKE_CXX_FLAGS_RELEASE    "-O2 -std=c++0x -g")
+SET(UGDIR "/usr/ug/lib")
 
 PKG_CHECK_MODULES(UG_WEB_APP_DETAIL_DEPS
+    dlog
     ecore
     elementary
     efl-assist