Merge pull request #418 from mrc-ide/fix-quote-libs

Quote include path to cope with spaces

Author: richfitz

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dust
 Title: Iterate Multiple Realisations of Stochastic Models
-Version: 0.15.1
+Version: 0.15.2
 Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"),
                     email = "[email protected]"),
              person("Alex", "Hill", role = "aut"),
@@ -37,6 +37,7 @@ Suggests:
     bench,
     brio,
     callr,
+    curl,
     dde,
     decor,
     fs,

inst/template/Makevars

@@ -1,3 +1,3 @@
 # -*- makefile -*-
-PKG_CXXFLAGS=-I{{path_dust_include}} -DHAVE_INLINE $(SHLIB_OPENMP_CXXFLAGS) {{compiler_options}}
+PKG_CXXFLAGS=-I"{{path_dust_include}}" -DHAVE_INLINE $(SHLIB_OPENMP_CXXFLAGS) {{compiler_options}}
 PKG_LIBS=$(SHLIB_OPENMP_CXXFLAGS)

tests/testthat/test-rng.R

@@ -505,6 +505,7 @@ test_that("negative seed values result in sensible state", {
   expect_false(all(s0 == as.raw(0)))
   expect_false(all(s1 == as.raw(0)))
   expect_false(all(s10 == as.raw(0)))
+  skip_on_os("mac") # mrc-5288 - see mcstate2 for more on this
   expect_false(identical(s0, s1))
   expect_false(identical(s0, s10))
   expect_false(identical(s1, s10))