Add the compiler flag required for performing GTest

Change-Id: I7436ea10fe9e9652bb361e5b5cc6564f61216e7f
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/packaging/ua-manager.spec b/packaging/ua-manager.spec
index dab58cb..d0b5fcb 100644 (file)
--- a/packaging/ua-manager.spec
+++ b/packaging/ua-manager.spec
@@ -1,6 +1,6 @@
 Name:       ua-manager
 Summary:    User awareness manager
-Version:    0.12.14
+Version:    0.12.15
 Release:    1
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -21,6 +21,10 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(aul)
+%if 0%{?gtests:1}
+BuildRequires:  pkgconfig(gmock)
+%endif
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -51,6 +55,10 @@ cp %{SOURCE1001} .
 
 %build
 
+%if 0%{?gcov:1}
+export LDFLAGS+=" -lgcov"
+%endif
+
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DLIB_INSTALL_DIR=%{_libdir} \
@@ -59,7 +67,9 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DLIB_PATH=%{_lib} \
        -DFULLVER=%{version} \
        -DMAJORVER=${MAJORVER} \
-       -DDBPATH=%{database_full_path}
+       -DDBPATH=%{database_full_pathi \
+       -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0}} \
+       -DBUILD_GTESTS=%{?gtests:1}%{!?gtests:0}}
 
 %install
 %make_install

diff --git a/ua-api/CMakeLists.txt b/ua-api/CMakeLists.txt
index 0795b65..d365c5d 100644 (file)
--- a/ua-api/CMakeLists.txt
+++ b/ua-api/CMakeLists.txt
@@ -32,6 +32,10 @@ SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -g")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${STACK_CANARY_FLAGS} ${FORTIFY_FLAGS} ${RELRO_FLAGS} ${PIE_FLAGS} -Wall -Werror")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
+IF(BUILD_GCOV)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
+ENDIF(BUILD_GCOV)
+
 SET(SRCS
        src/ua-api.c
        src/ua-common.c

diff --git a/ua-daemon/CMakeLists.txt b/ua-daemon/CMakeLists.txt
index 9a8d9b5..51878cc 100644 (file)
--- a/ua-daemon/CMakeLists.txt
+++ b/ua-daemon/CMakeLists.txt
@@ -50,7 +50,7 @@ INCLUDE(FindPkgConfig)
 pkg_check_modules(PKGS_MGR REQUIRED ${PKG_MODULES})
 
 FOREACH(flag ${PKGS_MGR_CFLAGS})
-        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -Wall")
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -Wall")
 ENDFOREACH(flag)
 
 IF(DBPATH)
@@ -58,19 +58,24 @@ IF(DBPATH)
 ENDIF(DBPATH)
 
 SET(RELRO_FLAGS "-Wl,-z,relro")
-SET(FORTIFY_FLAGS "-D_FORTIFY_SOURCE=2")
+SET(FORTIFY_FLAGS "-D_FORTIFY_SOURCE=2 -O")
 SET(STACK_CANARY_FLAGS "-fstack-protector-strong")
 SET(PIE_FLAGS "-fPIE -fPIC")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${STACK_CANARY_FLAGS} ${FORTIFY_FLAGS} ${RELRO_FLAGS} ${PIE_FLAGS} -Wall -Werror")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${STACK_CANARY_FLAGS} ${FORTIFY_FLAGS} ${RELRO_FLAGS} ${PIE_FLAGS} ${GTEST_FLAGS} -Wall -Werror")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")
+
+IF(BUILD_GTESTS)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
+ENDIF(BUILD_GTESTS)
+
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
 FIND_PROGRAM(UNAME NAMES uname)
 EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
 IF("${ARCH}" STREQUAL "arm")
-        ADD_DEFINITIONS("-DTARGET")
-        MESSAGE("add -DTARGET")
+       ADD_DEFINITIONS("-DTARGET")
+       MESSAGE("add -DTARGET")
 ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})