Fix build error on gcc version 7.x

[platform/upstream/iotivity.git] / service / third_party_libs.scons

diff --git a/service/third_party_libs.scons b/service/third_party_libs.scons
index f979c89..f5d709f 100644 (file)
--- a/service/third_party_libs.scons
+++ b/service/third_party_libs.scons
@@ -1,3 +1,23 @@
+#******************************************************************
+#
+# Copyright 2014 Samsung Electronics All Rights Reserved.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 ######################################################################
 # This script manages third party libraries
 #
@@ -17,7 +37,7 @@ resource_path = src_dir + '/resource'
 ######################################################################
 # Check dependent packages (Linux only)
 ######################################################################
-if target_os in ['linux', 'tizen']:
+if target_os in ['linux']:
        if not env.GetOption('help'):
                if not target_arch == platform.machine():
                        print '''
@@ -29,15 +49,15 @@ if target_os in ['linux', 'tizen']:
 
                conf = Configure(lib_env)
 
-               if not conf.CheckLib('boost_thread'):
+               if target_os not in ['tizen'] and not conf.CheckLib('boost_thread', language='C++'):
                        print 'Did not find boost_thread, exiting!'
                        Exit(1)
 
-               if not conf.CheckLib('boost_system'):
+               if target_os not in ['tizen'] and not conf.CheckLib('boost_system', language='C++'):
                        print 'Did not find boost_system, exiting!'
                        Exit(1)
 
-               conf.Finish()
+               lib_env = conf.Finish()
 
 ######################################################################
 # The 'include' path of external libraries
@@ -47,7 +67,7 @@ lib_env.AppendUnique(CPPPATH = [
                resource_path + '/include' ,
                resource_path + '/oc_logger/include',
                resource_path + '/csdk/stack/include',
-               resource_path + '/csdk/ocrandom/include',
+               resource_path + '/c_common/ocrandom/include',
                resource_path + '/csdk/logger/include'
                ])
 
@@ -70,10 +90,15 @@ if target_os == 'android':
                lib_env.AppendUnique(CCFLAGS = ['-w'])
 
 elif target_os == 'ios':
-       lib_env.AppendUnique(FRAMEWORKS = ['boost', 'expat', 'openssl'])
+       lib_env.AppendUnique(FRAMEWORKPATH = [src_dir + '/extlibs/boost/ios/framework'])
+       lib_env.AppendUnique(FRAMEWORKS = ['boost'])
 elif target_os == 'darwin':
        lib_env.AppendUnique(CPPPATH = ['/usr/local/include'])
        lib_env.AppendUnique(LIBPATH = ['/usr/local/lib'])
+elif target_os == 'windows':
+       boost_path = os.path.join(src_dir,'extlibs','boost','boost')
+       lib_env.AppendUnique(CPPPATH = [boost_path])
 
 Import('env')
 lib_env.AppendUnique(LIBPATH = env.get('BUILD_DIR'))
+