fix build error on building gcov mode

Change-Id: I9e5e202a3d6265a0c86ebc17106fa9d40ea4cdfc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24cdefa..5720c90 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,13 +13,8 @@ SET(zigbee_pkgs glib-2.0 dlog gio-2.0 gio-unix-2.0)
 
 pkg_check_modules(pkgs REQUIRED "${zigbee_pkgs}")
 
-IF (BUILD_GTESTS)
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fpic -Wall -Werror-implicit-function-declaration")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Werror -Wextra -Wall -Wdeclaration-after-statement -Wmissing-declarations -Wredundant-decls -Wcast-align -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -fvisibility=default -fprofile-arcs -ftest-coverage")
-ELSE (BUILD_GTESTS)
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fpic -Werror-implicit-function-declaration")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Werror -Wextra -Wall -Wdeclaration-after-statement -Wmissing-declarations -Wredundant-decls -Wcast-align -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
-#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Werror -Wextra -Wall -Wdeclaration-after-statement -Wmissing-declarations -Wredundant-decls -Wcast-align -Wcast-qual -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
-ENDIF (BUILD_TESTS)
 
 ### Address-Space Layout Randomization ###
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")

diff --git a/haltest/CMakeLists.txt b/haltest/CMakeLists.txt
index eb284f6..ccf2970 100644 (file)
--- a/haltest/CMakeLists.txt
+++ b/haltest/CMakeLists.txt
@@ -28,6 +28,6 @@ FILE(GLOB HALTEST_SRCS *.cpp)
 SET(HALTEST_SRCS ${HALTEST_SRCS})
 
 ADD_EXECUTABLE(${HALTEST} ${HALTEST_SRCS})
-TARGET_LINK_LIBRARIES(${HALTEST} ${HALTEST_LDFLAGS} ${HALTEST_PKG_LDFLAGS} -ldl -lgcov)
+TARGET_LINK_LIBRARIES(${HALTEST} ${HALTEST_LDFLAGS} ${HALTEST_PKG_LDFLAGS} dl)
 
 INSTALL(TARGETS ${HALTEST} RUNTIME DESTINATION bin)

diff --git a/packaging/zigbee-manager.spec b/packaging/zigbee-manager.spec
index b253dce..ec6645a 100644 (file)
--- a/packaging/zigbee-manager.spec
+++ b/packaging/zigbee-manager.spec
@@ -71,6 +71,9 @@ cp -a %{SOURCE2} .
 
 %build
 %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
 

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index a32f713..e7a7418 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -27,6 +27,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} ${GTEST_TEST_LDFLAGS} ${GTEST_TEST_PKG_LDFLAGS} -ldl -lgcov)
+TARGET_LINK_LIBRARIES(${GTEST_TEST} ${GTEST_TEST_LDFLAGS} ${GTEST_TEST_PKG_LDFLAGS} dl)
 
 INSTALL(TARGETS ${GTEST_TEST} RUNTIME DESTINATION bin)