Merge branch '1.4-rel' (0bba2f8) 43/25843/1
authorPhilippe Coval <p.coval@samsung.com>
Mon, 18 Jun 2018 09:11:49 +0000 (11:11 +0200)
committerPhilippe Coval <p.coval@samsung.com>
Mon, 18 Jun 2018 09:11:55 +0000 (11:11 +0200)
Relate-to:
      I2704ed9c7c6fa3b234f49b50ff7cdd53f2d1f737
      I69ca3d5a0fe59626b545047530b68fd0cfdd27ad
      I20333c980226dc6a0c257dc36aab1502202993d9
      Ibd33bf931322a58e3efac1ccfebd5ea5cb6a1330
      I95ea9ae239336c7b602d55569d2c2f9b5b2976d3
      I85e0b6a1585eac4d0f90154c261103ce58343fd7

Change-Id: I0bba2f80fe940271fe32e4c34dd4f54deb0f2dc6
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
resource/csdk/security/SConscript
resource/csdk/security/provisioning/src/SConscript
resource/csdk/stack/src/ocresource.c
resource/provisioning/SConscript

Simple merge
Simple merge
@@@ -109,5 -109,9 +109,9 @@@ ocprovision_env.UserInstallTargetLib(oc
  ocprovision_env.UserInstallTargetHeader(
      '../include/OCProvisioningManager.hpp', 'resource', 'OCProvisioningManager.hpp')
  
- if target_os in ['linux', 'tizen', 'webos']:
 -if target_os not in ['msys_nt', 'windows']:
++if target_os in ['linux', 'msys_nt', 'tizen', 'webos']:
+     if ocprovision_env.get('WITH_TCP') == True and ocprovision_env.get('WITH_CLOUD') == True:
+         ocprovision_env.PrependUnique(LIBS=['cloud'])
+ if target_os in ['linux', 'tizen']:
      SConscript('examples/SConscript')