mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweaks to C++ build to only explicity link libiconv if it exists; closes issue 1117

Browse source 
from speed145a

git-svn-id: https://zxing.googlecode.com/svn/trunk@2115 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2012-01-12 23:30:18 +00:00
parent 748945281c
commit 28a0ceb67d
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cpp/SConscript
View file

@ -1,6 +1,8 @@
# -*- python -*-
Decider('MD5')
import fnmatch
import os
vars = Variables()
vars.Add(BoolVariable('DEBUG', 'Set to disable optimizations', 1))
@ -35,7 +37,16 @@ def all_files(dir, ext='.cpp', level=6):
magick_include = ['/usr/include/ImageMagick/', '/opt/local/include/ImageMagick/']
magick_libs = ['Magick++', 'MagickWand', 'MagickCore', 'iconv']
magick_libs = ['Magick++', 'MagickWand', 'MagickCore']
# check for existence of libiconv and add it to magick_libs if possible
matches = []
for root, dirnames, filenames in os.walk('/usr/lib/'):
for filename in fnmatch.filter(filenames, 'libiconv.*'):
matches.append(os.path.join(root, filename))
if matches:
magick_libs.append('iconv')
cppunit_include = ['/opt/local/include/']
cppunit_libs = ['cppunit']