Fix build error caused by not including header path for gtest

Change-Id: If7c096efe89cb42138a80870840d834d29296a73
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1311
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/basis/common/primitiveResource/SConscript b/service/basis/common/primitiveResource/SConscript
index 1942b9c..5dc7497 100644 (file)
--- a/service/basis/common/primitiveResource/SConscript
+++ b/service/basis/common/primitiveResource/SConscript
@@ -30,6 +30,8 @@ SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', exports = 'li
 
 src_dir = lib_env.get('SRC_DIR')
 
+gtest_dir = src_dir + '/extlibs/gtest/gtest-1.7.0'
+
 service_common_env = lib_env.Clone()
 target_os = env.get('TARGET_OS')
 
@@ -68,10 +70,12 @@ service_common_env.InstallTarget([service_common_static,service_common_shared],
 # Build Test
 ######################################################################
 service_common_test_env = service_common_env.Clone();
+
 service_common_test_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+service_common_test_env.PrependUnique(CPPPATH = [gtest_dir + '/include'])
 
-gtest = File(src_dir + '/extlibs/gtest/gtest-1.7.0/lib/.libs/libgtest.a')
-gtest_main = File(src_dir + '/extlibs/gtest/gtest-1.7.0/lib/.libs/libgtest_main.a')
+gtest = File(gtest_dir + '/lib/.libs/libgtest.a')
+gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')
 
 service_common_test_env.PrependUnique(LIBS = [
     'oc',

diff --git a/service/basis/serverBuilder/SConscript b/service/basis/serverBuilder/SConscript
index b1342cb..30fd4f0 100644 (file)
--- a/service/basis/serverBuilder/SConscript
+++ b/service/basis/serverBuilder/SConscript
@@ -30,6 +30,8 @@ SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', exports = 'li
 
 src_dir = lib_env.get('SRC_DIR')
 
+gtest_dir = src_dir + '/extlibs/gtest/gtest-1.7.0'
+
 server_builder_env = lib_env.Clone()
 target_os = env.get('TARGET_OS')
 
@@ -63,25 +65,27 @@ if not release:
 # Source files and Targets
 ######################################################################
 server_builder_src = env.Glob('src/*.cpp')
+
 server_builder_static = server_builder_env.StaticLibrary('server_builder', server_builder_src)
 server_builder_shared = server_builder_env.SharedLibrary('server_builder', server_builder_src)
 
-server_builder_env.InstallTarget([server_builder_static,server_builder_shared], 'server_builder')
+server_builder_env.InstallTarget([server_builder_static, server_builder_shared], 'server_builder')
 
 ######################################################################
 # Build Test
 ######################################################################
 server_builder_test_env = server_builder_env.Clone();
-server_builder_test_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 
-server_builder_test_env.AppendUnique(CPPPATH = [env.get('SRC_DIR')+'/extlibs/hippomocks-master'])
+server_builder_test_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+server_builder_test_env.AppendUnique(CPPPATH = [
+    env.get('SRC_DIR')+'/extlibs/hippomocks-master',
+    gtest_dir + '/include'
+    ])
 
-gtest = File(src_dir + '/extlibs/gtest/gtest-1.7.0/lib/.libs/libgtest.a')
-gtest_main = File(src_dir + '/extlibs/gtest/gtest-1.7.0/lib/.libs/libgtest_main.a')
+gtest = File(gtest_dir + '/lib/.libs/libgtest.a')
+gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')
 
 server_builder_test_env.PrependUnique(LIBS = [
-    gtest,
-    gtest_main,
     'server_builder',
     'service_common',
     'pthread',
@@ -90,6 +94,8 @@ server_builder_test_env.PrependUnique(LIBS = [
     'oc_logger',
     'connectivity_abstraction',
     'coap',
+    gtest,
+    gtest_main,
     ])
 
 server_builder_test_src = env.Glob('unittests/*.cpp')