From 536604e744ef358dd9cf05542108728aaa3e2436 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Fri, 3 Mar 2017 01:04:22 +0100 Subject: [PATCH] resource-directory: Fix libs dependencies and order Problem was observed when building on yocto Bug: https://jira.iotivity.org/browse/IOT-1745 Change-Id: I1246cd5bb83738a14fa0aa9e68cf35c4fbc8cbac Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/17651 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai --- resource/csdk/resource-directory/unittests/SConscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resource/csdk/resource-directory/unittests/SConscript b/resource/csdk/resource-directory/unittests/SConscript index 3cc6ad1..06c6093 100644 --- a/resource/csdk/resource-directory/unittests/SConscript +++ b/resource/csdk/resource-directory/unittests/SConscript @@ -68,12 +68,14 @@ rd_test_env.AppendUnique( rd_test_env.AppendUnique(LIBPATH = [lib_env.get('BUILD_DIR')]) rd_test_env.AppendUnique(RPATH = [lib_env.get('BUILD_DIR')]) -rd_test_env.PrependUnique(LIBS = ['resource_directory', 'octbstack' ]) +rd_test_env.PrependUnique(LIBS = ['octbstack']) if rd_test_env.get('RD_MODE'): rd_mode = rd_test_env.get('RD_MODE') + rd_test_env.PrependUnique(LIBS = ['resource_directory']) if 'CLIENT' in rd_mode: rd_test_env.AppendUnique(CPPDEFINES = ['RD_CLIENT']) + rd_test_env.AppendUnique(LIBS = ['oc', 'oc_logger']) if 'SERVER' in rd_mode: rd_test_env.AppendUnique(CPPDEFINES = ['RD_SERVER']) -- 2.7.4