From: Carl Hetherington <cth@carlh.net>
Date: Thu, 2 Jul 2015 17:34:48 +0000 (+0100)
Subject: Attempt to fix boost regex deps.
X-Git-Tag: v2.1.16~6
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=6bebefd325e60dd19342216f601e41e7cd459b55;p=dcpomatic.git

Attempt to fix boost regex deps.
---

diff --git a/src/lib/wscript b/src/lib/wscript
index 1f870462e..5a9c2b7fc 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -132,7 +132,7 @@ def build(bld):
     obj.export_includes = ['..']
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
-                 BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
+                 BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
                  CURL ZIP PANGOMM CAIROMM XMLSEC SUB
                  """
diff --git a/src/tools/wscript b/src/tools/wscript
index ffd77c6cb..fb5619b99 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -28,7 +28,7 @@ def configure(conf):
 
 def build(bld):
     uselib =  'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC '
-    uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH WXWIDGETS ZIP CAIROMM PANGOMM SUB MAGICK SNDFILE '
+    uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM BOOST_REGEX SSH WXWIDGETS ZIP CAIROMM PANGOMM SUB MAGICK SNDFILE '
 
     if bld.env.TARGET_WINDOWS:
         uselib += 'WINSOCK2'
diff --git a/src/wx/wscript b/src/wx/wscript
index 370f59c62..b828c7711 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -105,11 +105,11 @@ def configure(conf):
                 stlibs.append(os.path.basename(f)[3:-2])
             else:
                 new_linkflags.append(f)
-        
+
         conf.env.STLIB_WXWIDGETS = stlibs
         conf.env.LINKFLAGS_WXWIDGETS = new_linkflags
         conf.env.STLIBPATH_WXWIDGETS = stlib_paths
- 
+
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='', path='wx-config', args='--version').strip()
     conf.im_msg = 0
@@ -124,7 +124,7 @@ def build(bld):
 
     obj.name   = 'libdcpomatic2-wx'
     obj.export_includes = ['..']
-    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD WXWIDGETS DCP SUB ZIP '
+    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP '
     if bld.env.TARGET_LINUX:
         obj.uselib += 'GTK '
     if bld.env.TARGET_WINDOWS:
diff --git a/wscript b/wscript
index 9d6ef65e9..98cca364a 100644
--- a/wscript
+++ b/wscript
@@ -295,6 +295,7 @@ def configure(conf):
         conf.env.STLIB_BOOST_DATETIME = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix]
         conf.env.STLIB_BOOST_SIGNALS2 = ['boost_signals2']
         conf.env.STLIB_BOOST_SYSTEM = ['boost_system']
+        conf.env.STLIB_BOOST_REGEX = ['boost_regex']
     else:
         conf.check_cxx(fragment="""
                             #include <boost/version.hpp>\n