Fix windows build in master (2)

[Patch #2] Removed duplicate sqlite parse-config for tizen
[Patch #3] Fix typo that causes tizen build fail

Change-Id: I75f6cadc3120d37357278f556ab44eecd7682a01
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11689
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11719

diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript
index e7429ff..d288790 100644 (file)
--- a/resource/csdk/security/SConscript
+++ b/resource/csdk/security/SConscript
@@ -112,8 +112,6 @@ libocsrm_src = [
        ]
 
 if libocsrm_env.get('SECURED') == '1':
-       if target_os in ['tizen']:
-               libocsrm_env.ParseConfig('pkg-config --cflags --libs sqlite3')
        libocsrm_src = libocsrm_src + [OCSRM_SRC + 'oxmpincommon.c', OCSRM_SRC + 'pbkdf2.c']
 
 if target_os in ['windows', 'msys_nt']:

diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript
index 4ef15ed..68a68ab 100644 (file)
--- a/resource/csdk/security/provisioning/SConscript
+++ b/resource/csdk/security/provisioning/SConscript
@@ -55,9 +55,6 @@ provisioning_env.AppendUnique(CPPPATH = [
                'ck_manager/include'
                ])
 
-if target_os not in ['tizen', 'windows', 'msys_nt']:
-       provisioning_env.AppendUnique(CPPPATH = ['../../../../extlibs/sqlite3'])
-
 provisioning_env.AppendUnique(CPPDEFINES= ['__WITH_DTLS__'])
 
 if 'g++' in provisioning_env.get('CXX'):
@@ -82,9 +79,6 @@ if target_os not in ['msys_nt', 'windows', 'android']:
 if target_os in ['windows', 'msys_nt']:
        provisioning_env.AppendUnique(LIBS = ['ws2_32', 'advapi32', 'iphlpapi', 'timer'])
 
-if target_os in ['tizen']:
-       provisioning_env.ParseConfig('pkg-config --cflags --libs sqlite3')
-
 if target_os in ['android']:
        provisioning_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
        provisioning_env.AppendUnique(LIBS = ['gnustl_static'])
@@ -117,7 +111,10 @@ if provisioning_env.get('WITH_TCP') == True:
        'src/cloud/aclid.c',
        'src/cloud/csr.c']
 
-if target_os not in ['tizen', 'windows', 'msys_nt']:
+if target_os in ['tizen']:
+       provisioning_env.ParseConfig('pkg-config --cflags --libs sqlite3')
+else:
+       provisioning_env.AppendUnique(CPPPATH = ['../../../../extlibs/sqlite3'])
        provisioning_src = provisioning_src + [root_dir+'/extlibs/sqlite3/sqlite3.c' ]
 
 if target_os in ['windows', 'msys_nt']: