Build: reworked unit tests to use gtest in a more generic way

[platform/upstream/iotivity.git] / resource / src / SConscript

diff --git a/resource/src/SConscript b/resource/src/SConscript
index 7a43499..331d41a 100644 (file)
--- a/resource/src/SConscript
+++ b/resource/src/SConscript
@@ -27,7 +27,7 @@ import os
 
 # Add third party libraries
 lib_env = env.Clone()
-SConscript(env.get('SRC_DIR') + '/resource/third_party_libs.scons', 'lib_env')
+SConscript('#resource/third_party_libs.scons', 'lib_env')
 
 oclib_env = lib_env.Clone()
 secured = lib_env.get('SECURED')
@@ -50,13 +50,13 @@ oclib_env.AppendUnique(LIBS = ['oc_logger'])
 oclib_env.PrependUnique(LIBS = ['octbstack', 'connectivity_abstraction', 'ocsrm'])
 
 target_os = env.get('TARGET_OS')
-if target_os == 'linux':
+if target_os in ['linux']:
        oclib_env.AppendUnique(LIBS = ['pthread'])
 
-if target_os not in ['windows', 'winrt']:
+if target_os not in ['windows']:
        oclib_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-fPIC'])
 
-if target_os not in ['darwin', 'ios', 'windows', 'winrt']:
+if target_os not in ['darwin', 'ios', 'windows']:
        oclib_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined'])
 
 if target_os == 'android':
@@ -91,7 +91,8 @@ oclib_src = [
                'InProcServerWrapper.cpp',
                'InProcClientWrapper.cpp',
                'OCResourceRequest.cpp',
-               'CAManager.cpp'
+               'CAManager.cpp',
+               'OCDirectPairing.cpp'
        ]
 
 if target_os in ['windows']:
@@ -130,6 +131,7 @@ oclib_env.UserInstallTargetHeader(header_dir + 'OCResourceResponse.h', 'resource
 oclib_env.UserInstallTargetHeader(header_dir + 'OCUtilities.h', 'resource', 'OCUtilities.h')
 
 oclib_env.UserInstallTargetHeader(header_dir + 'CAManager.h', 'resource', 'CAManager.h')
+oclib_env.UserInstallTargetHeader(header_dir + 'OCDirectPairing.h', 'resource', 'OCDirectPairing.h')
 
 # Add Provisioning library
 if target_os in ['linux', 'android', 'tizen'] and env.get('SECURED') == '1':