From 4590e0f777bf11d4b5657389d0f962544732aed4 Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Thu, 27 Apr 2017 20:25:26 -0700 Subject: [PATCH] cloud: SConscript cleanup. Removing settings already present in the global "env" variable along with any modifications to that global environment to get rid of cross dependencies between scripts and forcing them to be executed in a specific order. Bug: https://jira.iotivity.org/browse/IOT-1583 Change-Id: I27edcf846d9436636a61cd83852335f86133bb4a Signed-off-by: Pawel Winogrodzki Reviewed-on: https://gerrit.iotivity.org/gerrit/21289 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai Reviewed-by: Mats Wichmann Reviewed-by: Phil Coval --- arduino.scons | 2 -- cloud/samples/client/SConscript | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arduino.scons b/arduino.scons index 606cab8..9835545 100644 --- a/arduino.scons +++ b/arduino.scons @@ -57,5 +57,3 @@ env.AppendUnique(CPPDEFINES=[ '-D__OIC_DEVICE_NAME__=' + "\'\"" + env.get('DEVICE_NAME') + "\"\'" ]) -if env.get('LOGGING'): - env.AppendUnique(CPPDEFINES=['TB_LOG']) diff --git a/cloud/samples/client/SConscript b/cloud/samples/client/SConscript index c3434fd..eaae110 100644 --- a/cloud/samples/client/SConscript +++ b/cloud/samples/client/SConscript @@ -44,6 +44,9 @@ cc_sample_app_env.AppendUnique(CPPPATH=[ '#/resource/csdk/resource-directory/include', '#/resource/csdk/include', '#/resource/csdk/stack/include', + '#/resource/c_common', + '#/resource/c_common/oic_malloc/include', + '#/resource/c_common/oic_string/include', '#/resource/c_common/ocrandom/include', '#/resource/csdk/logger/include', '#/resource/oc_logger/include', @@ -58,7 +61,6 @@ cc_sample_app_env.AppendUnique(CPPPATH=[ cc_sample_app_env.AppendUnique( CXXFLAGS=['-O2', '-g', '-Wall', '-Wextra', '-std=c++0x', '-pthread']) -cc_sample_app_env.AppendUnique(LIBPATH=[env.get('BUILD_DIR')]) cc_sample_app_env.AppendUnique(RPATH=[env.get('BUILD_DIR')]) cc_sample_app_env.PrependUnique(LIBS=[ -- 2.7.4