X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fnotification%2Fcpp-wrapper%2Fconsumer%2FSConscript;h=f72933e2230f0ce77b94f391d2a3f1aadb94c57c;hb=8229635f6d207516ccbbdf23b13be164e0fc1787;hp=ec464347ae784ad9e1067cba63b63280fb698792;hpb=6c75fecbf629a220e0788155395866a2371beace;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/notification/cpp-wrapper/consumer/SConscript b/service/notification/cpp-wrapper/consumer/SConscript
index ec46434..f72933e 100755
--- a/service/notification/cpp-wrapper/consumer/SConscript
+++ b/service/notification/cpp-wrapper/consumer/SConscript
@@ -70,13 +70,25 @@ if target_os == 'android':
     notification_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
     notification_env.PrependUnique(LIBS = ['gnustl_shared', 'log'])
 
-if not env.get('RELEASE'):
+if not env.get('RELEASE') and target_os not in ['ios']:
     notification_env.PrependUnique(LIBS = ['gcov'])
     notification_env.AppendUnique(CCFLAGS = ['--coverage'])
 
 if env.get('WITH_CLOUD') == True:
 	notification_env.AppendUnique(CPPDEFINES = ['WITH_CLOUD'])
 
+with_mq = env.get('WITH_MQ')
+if 'SUB' in with_mq:
+    notification_env.AppendUnique(CPPDEFINES = ['MQ_SUBSCRIBER', 'WITH_MQ'])
+    print "MQ SUB support"
+
+if 'PUB' in with_mq:
+    notification_env.AppendUnique(CPPDEFINES = ['MQ_PUBLISHER', 'WITH_MQ'])
+    print "MQ PUB support"
+
+if 'BROKER' in with_mq:
+    notification_env.AppendUnique(CPPDEFINES = ['MQ_BROKER', 'WITH_MQ'])
+    print "MQ Broker support"
 ######################################################################
 # Source files and Targets for Consumer
 ######################################################################
@@ -88,9 +100,10 @@ Import('notificationCommonSharedObjs')
 notification_consumer_src = [
 	env.Glob('src/*.cpp'),notificationCommonSharedObjs]
 
-consumersdk = notification_env.SharedLibrary('notification_consumer_wrapper', notification_consumer_src)
-notification_env.InstallTarget(consumersdk, 'libnotification_consumer_wrapper')
-notification_env.UserInstallTargetLib(consumersdk, 'libnotification_consumer_wrapper')
+if target_os not in ['ios']:
+	consumersdk = notification_env.SharedLibrary('notification_consumer_wrapper', notification_consumer_src)
+	notification_env.InstallTarget(consumersdk, 'libnotification_consumer_wrapper')
+	notification_env.UserInstallTargetLib(consumersdk, 'libnotification_consumer_wrapper')
 
 notification_consumer_src = [
 	env.Glob('src/*.cpp'),notificationCommonStaticObjs]
@@ -99,10 +112,15 @@ consumersdk = notification_env.StaticLibrary('notification_consumer_wrapper', no
 notification_env.InstallTarget(consumersdk, 'libnotification_consumer_wrapper')
 notification_env.UserInstallTargetLib(consumersdk, 'libnotification_consumer_wrapper')
 
+notification_env.UserInstallTargetHeader("inc/NSProvider.h", 'service/notification', 'NSProvider.h')
+notification_env.UserInstallTargetHeader("inc/NSConsumerService.h", 'service/notification', 'NSConsumerService.h')
+
 ######################################################################
 # Source files and Targets for Consumer Jni
 ######################################################################
 if target_os == 'android':
+	Import('notificationJniCommonSharedObjs')
+
 	notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../../../extlibs/boost/boost_1_58_0'])
 	notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../../../android/android_api/base/jni'])
 	notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../android/notification-service/src/main/jni/common'])
@@ -114,7 +132,7 @@ if target_os == 'android':
 
 	notification_consumer_jni_src = [
 		env.Glob('../../android/notification-service/src/main/jni/consumer/*.cpp'),
-		env.Glob('../../android/notification-service/src/main/jni/common/*.cpp')]
+		notificationJniCommonSharedObjs]
 
 	consumerJni = notification_jni_consumer_env.SharedLibrary('notification_consumer_jni', notification_consumer_jni_src)
 	notification_jni_consumer_env.InstallTarget(consumerJni, 'libnotification_consumer_jni')