X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=fda4bac772b881b561a31b8d4dcf5952ef33ef49;hb=51701447357322a6e76b2ba1c2f3e884e72da51f;hp=f1e0dd30a0d90c4c248c85ac6fa4b7e0b196bbd8;hpb=d14bbc2088ed9c0f9d77f15cb943968a70bb8198;p=libcxml.git

diff --git a/wscript b/wscript
index f1e0dd3..fda4bac 100644
--- a/wscript
+++ b/wscript
@@ -1,13 +1,23 @@
 APPNAME = 'libcxml'
-VERSION = '0.01'
+VERSION = '0.04pre'
 
 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('--static', action='store_true', default = False, help = 'build statically')
 
 def configure(conf):
     conf.load('compiler_cxx')
     conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2'])
 
+    conf.env.TARGET_WINDOWS = conf.options.target_windows
+    conf.env.STATIC = conf.options.static
+
+    if conf.options.target_windows:
+        boost_lib_suffix = '-mt'
+    else:
+        boost_lib_suffix = ''
+
     conf.check_cfg(package = 'libxml++-2.6', args = '--cflags --libs', uselib_store = 'LIBXML++', mandatory = True)
 
     conf.check_cxx(fragment = """
@@ -16,9 +26,18 @@ def configure(conf):
 		   """,
                    msg = 'Checking for boost filesystem library',
                    libpath = '/usr/local/lib',
-                   lib = ['boost_filesystem', 'boost_system'],
+                   lib = ['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                    uselib_store = 'BOOST_FILESYSTEM')
 
+    conf.check_cxx(fragment = """
+                              #define BOOST_TEST_MODULE Config test\n
+    			      #include <boost/test/unit_test.hpp>\n
+                              int main() {}
+                              """,
+                              msg = 'Checking for boost unit testing library',
+                              lib = ['boost_unit_test_framework%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
+                              uselib_store = 'BOOST_TEST')
+
     conf.recurse('test')
 
 def build(bld):
@@ -26,7 +45,7 @@ def build(bld):
     bld(source = 'libcxml.pc.in',
         version = VERSION,
         includedir = '%s/include' % bld.env.PREFIX,
-        libs = "-L${libdir}",
+        libs = "-L${libdir} -lcxml",
         install_path = '${LIBDIR}/pkgconfig')
 
     bld.recurse('src')