diff options
| author | Philippe Coval <philippe.coval@osg.samsung.com> | 2016-10-06 15:45:15 +0200 |
|---|---|---|
| committer | Phil Coval <philippe.coval@osg.samsung.com> | 2016-10-18 07:15:48 +0000 |
| commit | d1ee9e78d898746b842a2439f88d26fd30a377bc (patch) | |
| tree | b189b3edf724af1185d78db345f02b8fe2e9c5f9 | |
| parent | 9ff9fd88178c1b84b6fda2bff32451a42872f1cb (diff) | |
| download | iotivity-d1ee9e78d898746b842a2439f88d26fd30a377bc.tar.gz iotivity-d1ee9e78d898746b842a2439f88d26fd30a377bc.tar.bz2 iotivity-d1ee9e78d898746b842a2439f88d26fd30a377bc.zip | |
tizen: Use sqlite from system not scon puller
Change-Id: Id4382d37d34e5ac7d023e38bebd60228c6e6860e
Bug: https://jira.iotivity.org/browse/IOT-1296
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
| -rw-r--r-- | service/easy-setup/enrollee/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/service/easy-setup/enrollee/SConscript b/service/easy-setup/enrollee/SConscript index 400ff7a4a..a09b37d36 100644 --- a/service/easy-setup/enrollee/SConscript +++ b/service/easy-setup/enrollee/SConscript @@ -47,11 +47,14 @@ enrollee_env.PrependUnique(CPPPATH = [ enrollee_env.get('SRC_DIR') + '/resource/csdk/logger/include', enrollee_env.get('SRC_DIR') + '/resource/csdk/security/include', enrollee_env.get('SRC_DIR') + '/extlibs/cjson', - enrollee_env.get('SRC_DIR') + '/extlibs/sqlite3', enrollee_env.get('SRC_DIR') + '/service/easy-setup/inc', enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/inc', enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src']) +if target_os not in ['tizen']: + enrollee_env.PrependUnique(CPPPATH = [ + enrollee_env.get('SRC_DIR') + '/extlibs/sqlite3']) + if enrollee_env.get('SECURED') == '1': enrollee_env.AppendUnique(CPPPATH = [ enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include', |