Build gtest when gcov flag is defined only

--wrap option causes build error on specific build system.

Change-Id: I8422e73fbc21b4090ccde8d2731d7c18aa6ff817

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1980f8d60e47375ec602fd3422ebc2cb62f921b6..cf15c88b4ea39798604a7764a1a3d741151e44fc 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,4 +60,7 @@ CONFIGURE_FILE(
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 ADD_SUBDIRECTORY(tools)
-ADD_SUBDIRECTORY(tests)
+
+IF(BUILD_GTESTS)
+       ADD_SUBDIRECTORY(tests)
+ENDIF(BUILD_GTESTS)

diff --git a/packaging/capi-network-softap.spec b/packaging/capi-network-softap.spec
index e2b3e08521a96aa33b2973bbb1671f866e8155be..7fc0bc4430dd75ae34b453181607398c7eb4e7d9 100644 (file)
--- a/packaging/capi-network-softap.spec
+++ b/packaging/capi-network-softap.spec
@@ -56,7 +56,8 @@ export FFLAGS+=" -fprofile-arcs -ftest-coverage"
 export LDFLAGS+=" -lgcov"
 %endif
 
-%cmake .
+%cmake -DBUILD_GTESTS=%{?gcov:1}%{!?gcov:0} \
+       .
 make %{?_smp_mflags}
 
 %install
@@ -69,7 +70,9 @@ tar xf %{name}-gcov.tar -C %{buildroot}%{_datadir}/gcov/obj
 %endif
 
 %check
+%if 0%{?gcov:1}
 tests/softap-gtest
+%endif
 
 %if 0%{?gcov:1}
 lcov -c --ignore-errors graph --no-external -b . -d . -o %{name}.info