fix build error on building gcov mode

Change-Id: I66ab238d807d77cfde9877a62f479545dba6da6f

diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
index a6f7983..fef1fac 100755 (executable)
--- a/agent/CMakeLists.txt
+++ b/agent/CMakeLists.txt
@@ -91,11 +91,11 @@ IF (SUPPORT_OMA_DRM)
        ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
 ENDIF (SUPPORT_OMA_DRM)
 
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fpic -Wall -Werror -Werror-implicit-function-declaration")
 IF (BUILD_GTESTS)
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fpic -Wall -Werror-implicit-function-declaration")
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -fvisibility=default -fprofile-arcs -ftest-coverage")
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=default")
 ELSE (BUILD_GTESTS)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -fvisibility=hidden")
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden")
 ENDIF (BUILD_GTESTS)
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -fPIE")
 SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIE")

diff --git a/packaging/download-provider.spec b/packaging/download-provider.spec
index aecefbb..62078b8 100755 (executable)
--- a/packaging/download-provider.spec
+++ b/packaging/download-provider.spec
@@ -71,6 +71,9 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 
 %if 0%{?gcov:1}
+export CFLAGS+=" -fprofile-arcs -ftest-coverage"
+export CXXFLAGS+=" -fprofile-arcs -ftest-coverage"
+export FFLAGS+=" -fprofile-arcs -ftest-coverage"
 export LDFLAGS+=" -lgcov"
 %endif
 
@@ -105,7 +108,7 @@ export LDFLAGS+=" -lgcov"
        %{?_cmake_skip_rpath} \
        -DBUILD_SHARED_LIBS:BOOL=ON \
        -DBUILD_GTESTS=%{?gtests:1}%{!?gtests:0} \
-        -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} \
+       -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} \
        .
 
 make %{?jobs:-j%jobs}

diff --git a/provider-interface/CMakeLists.txt b/provider-interface/CMakeLists.txt
index 1d7f539..c41bea8 100755 (executable)
--- a/provider-interface/CMakeLists.txt
+++ b/provider-interface/CMakeLists.txt
@@ -29,17 +29,13 @@ SET(PROVIDER_INTERFACE_LINK_LIBRARIES
                pthread
        )
 
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fpic -Wall -Werror -Werror-implicit-function-declaration")
 IF (BUILD_GTESTS)
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fpic -Wall -Werror-implicit-function-declaration")
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -fvisibility=default -fprofile-arcs")
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=default")
 ELSE (BUILD_GTESTS)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -fvisibility=hidden")
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden")
 ENDIF (BUILD_GTESTS)
 
-IF (BUILD_GCOV)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage")
-ENDIF (BUILD_GCOV)
-
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -fPIE")
 SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIE")
 

diff --git a/provider/CMakeLists.txt b/provider/CMakeLists.txt
index 91e6329..155e6ee 100755 (executable)
--- a/provider/CMakeLists.txt
+++ b/provider/CMakeLists.txt
@@ -76,17 +76,13 @@ set(DP2_LINK_LIBRARIES ${GLIB-2_LIBRARIES}
                capi-appfw-app-manager
        )
 
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fpic -Wall -Werror -Werror-implicit-function-declaration")
 IF (BUILD_GTESTS)
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fpic -Wall -Werror-implicit-function-declaration")
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -fvisibility=default -fprofile-arcs")
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=default")
 ELSE (BUILD_GTESTS)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -fvisibility=hidden")
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden")
 ENDIF (BUILD_GTESTS)
 
-IF (BUILD_GCOV)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage")
-ENDIF (BUILD_GCOV)
-
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -fPIE")
 SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIE")
 

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index 227470b..3059c0b 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -33,6 +33,6 @@ FILE(GLOB GTEST_TEST_SRCS *.cpp)
 SET(GTEST_TEST_SRCS ${GTEST_TEST_SRCS})
 
 ADD_EXECUTABLE(${GTEST_TEST} ${GTEST_TEST_SRCS})
-TARGET_LINK_LIBRARIES(${GTEST_TEST} downloadagent2 download-provider-interface ${GTEST_TEST_LDFLAGS} ${GTEST_TEST_PKG_LDFLAGS} -ldl -lgcov)
+TARGET_LINK_LIBRARIES(${GTEST_TEST} downloadagent2 download-provider-interface ${GTEST_TEST_LDFLAGS} ${GTEST_TEST_PKG_LDFLAGS} dl)
 
 INSTALL(TARGETS ${GTEST_TEST} RUNTIME DESTINATION ${BIN_INSTALL_DIR})