X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=1219cb9e3f8f1e47552e6e34ed10af38eb80c145;hb=d69d2d2d32b6f874cc13ecec1ce705d44a1feb24;hp=b4664a5a7892c8f913392bb4efd9f97e596e5700;hpb=c9338a9960d363c86020dcb17fef7de40b72c061;p=libdcp.git

diff --git a/wscript b/wscript
index b4664a5a..1219cb9e 100644
--- a/wscript
+++ b/wscript
@@ -1,14 +1,15 @@
 import subprocess
 import os
+import sys
+import distutils.spawn
 
 APPNAME = 'libdcp'
-VERSION = '1.00.0devel'
+VERSION = '1.2.0devel'
 API_VERSION = '-1.0'
 
 def options(opt):
     opt.load('compiler_cxx')
     opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows')
-    opt.add_option('--target-osx', action='store_true', default=False, help='set up to build on OS X')
     opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation')
     opt.add_option('--static', action='store_true', default=False, help='build libdcp and in-tree dependencies statically, and link statically to openjpeg and cxml')
     opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
@@ -20,7 +21,7 @@ def configure(conf):
     conf.env.append_value('CXXFLAGS', ['-DLIBDCP_VERSION="%s"' % VERSION])
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
-    conf.env.TARGET_OSX = conf.options.target_osx
+    conf.env.TARGET_OSX = sys.platform == 'darwin'
     conf.env.ENABLE_DEBUG = conf.options.enable_debug
     conf.env.DISABLE_TESTS = conf.options.disable_tests
     conf.env.DISABLE_EXAMPLES = conf.options.disable_examples
@@ -32,7 +33,7 @@ def configure(conf):
     else:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX')
 
-    if not conf.options.target_osx:
+    if not conf.env.TARGET_OSX:
         conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter'])
 
     conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
@@ -40,7 +41,16 @@ def configure(conf):
     conf.check_cfg(package='xmlsec1', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True)
     # Remove erroneous escaping of quotes from xmlsec1 defines
     conf.env.DEFINES_XMLSEC1 = [f.replace('\\', '') for f in conf.env.DEFINES_XMLSEC1]
-    conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=False)
+
+    # ImageMagick / GraphicsMagick
+    if distutils.spawn.find_executable('Magick++-config'):
+        conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True)
+    else:
+        image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
+        graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
+        if image is None and graphics is None:
+            Logs.pprint('RED', 'Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required')
+
     conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False)
 
     if conf.options.static:
@@ -111,6 +121,7 @@ def configure(conf):
 
     if not conf.env.DISABLE_TESTS:
         conf.recurse('test')
+        conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False)
     conf.recurse('asdcplib')
 
 def build(bld):