Various small tweaks and fixes.

[libdcp.git] / wscript

diff --git a/wscript b/wscript
index 192abd4df2e7fa60cb68ee6933f3402598af5369..c115e4788d0929f40110750f77f18a8811f43aaf 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,6 +3,7 @@ import os
 
 APPNAME = 'libdcp'
 VERSION = '1.00.0devel'
+API_VERSION = '-1.0'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -10,6 +11,7 @@ def options(opt):
     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')
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -19,7 +21,9 @@ def configure(conf):
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.TARGET_OSX = conf.options.target_osx
     conf.env.ENABLE_DEBUG = conf.options.enable_debug
+    conf.env.DISABLE_TESTS = conf.options.disable_tests
     conf.env.STATIC = conf.options.static
+    conf.env.API_VERSION = API_VERSION
 
     if conf.options.target_windows:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS')
@@ -27,13 +31,15 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX')
 
     if not conf.options.target_osx:
-        conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
+        conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter'])
 
     conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
     conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
     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)
+    conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False)
 
     if conf.options.static:
         conf.check_cc(fragment="""
@@ -101,7 +107,8 @@ def configure(conf):
                    lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                    uselib_store='BOOST_DATETIME')
 
-    conf.recurse('test')
+    if not conf.env.DISABLE_TESTS:
+        conf.recurse('test')
     conf.recurse('asdcplib')
 
 def build(bld):
@@ -112,17 +119,18 @@ def build(bld):
     else:
         boost_lib_suffix = ''
 
-    bld(source='libdcp.pc.in',
+    bld(source='libdcp%s.pc.in' % bld.env.API_VERSION,
         version=VERSION,
-        includedir='%s/include' % bld.env.PREFIX,
-        libs="-L${libdir} -ldcp -lasdcp-libdcp -lkumu-libdcp -lboost_system%s" % boost_lib_suffix,
+        includedir='%s/include/libdcp%s' % (bld.env.PREFIX, bld.env.API_VERSION),
+        libs="-L${libdir} -ldcp%s -lasdcp-libdcp%s -lkumu-libdcp%s -lcxml -lboost_system%s" % (API_VERSION, bld.env.API_VERSION, bld.env.API_VERSION, boost_lib_suffix),
         install_path='${LIBDIR}/pkgconfig')
 
     bld.recurse('src')
     bld.recurse('tools')
-    bld.recurse('test')
+    if not bld.env.DISABLE_TESTS:
+        bld.recurse('test')
     bld.recurse('asdcplib')
-#    bld.recurse('examples')
+    bld.recurse('examples')
 
     bld.add_post_fun(post)