From 86fbd169fd68af2bde3d4955aa88d4464af982c0 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 20 Oct 2016 13:54:36 +0200 Subject: [PATCH] build: pkgconfig should link ocmapi too Change-Id: Ide4901338ba919b36cf129be5ecefc6f4f71d519 Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/13525 Tested-by: jenkins-iotivity Reviewed-by: Habib Virji (cherry picked from commit ae4c031dd2af6f05ed18d55f2d5c196e042f9bf6) Reviewed-on: https://gerrit.iotivity.org/gerrit/13565 Reviewed-by: Chul Lee --- build_common/SConscript | 7 ++++++- iotivity.pc.in | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build_common/SConscript b/build_common/SConscript index f89a8d3..665a3e3 100644 --- a/build_common/SConscript +++ b/build_common/SConscript @@ -340,12 +340,17 @@ if env.get('ROUTING') == 'GW': elif env.get('ROUTING') == 'EP': defines.append('-DROUTING_EP=1') +libs = [] +if env.get('SECURED'): + libs.append('-locpmapi') + pc_vars = { '\@VERSION\@': project_version, '\@PREFIX\@': user_prefix, '\@EXEC_PREFIX\@': user_prefix, '\@LIB_INSTALL_DIR\@': user_lib, - '\@DEFINES\@': " ".join(defines) + '\@DEFINES\@': " ".join(defines), + '\@LIBS\@': " ".join(libs) } env.Substfile(pc_file, SUBST_DICT = pc_vars) diff --git a/iotivity.pc.in b/iotivity.pc.in index f5c06c9..f5c7c39 100644 --- a/iotivity.pc.in +++ b/iotivity.pc.in @@ -11,7 +11,7 @@ Description: IoTivity is an open source reference implementation of the OIC stan Version: @VERSION@ URL: https://www.iotivity.org Requires: -Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction +Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction @LIBS@ Cflags: -I${includedir}/resource \ -I${includedir}/c_common \ -I${svcincludedir}/resource-encapsulation \ -- 2.7.4