diff options
Diffstat (limited to 'tests/wildcard')
| -rw-r--r-- | tests/wildcard/buildfile | 6 | ||||
| -rw-r--r-- | tests/wildcard/driver.cxx | 28 |
2 files changed, 28 insertions, 6 deletions
diff --git a/tests/wildcard/buildfile b/tests/wildcard/buildfile index fc8e94b..90e8b58 100644 --- a/tests/wildcard/buildfile +++ b/tests/wildcard/buildfile @@ -4,4 +4,10 @@ import libs = libbutl%lib{butl} +if ($cxx.features.modules && ($force_std_modules == true || $cxx.id != 'msvc')) +{ + import libs += libstd-modules%liba{std-modules} + cxx.poptions += -D__cpp_lib_modules +} + exe{driver}: {hxx cxx}{*} $libs test{testscript} diff --git a/tests/wildcard/driver.cxx b/tests/wildcard/driver.cxx index 502726f..d95d7cd 100644 --- a/tests/wildcard/driver.cxx +++ b/tests/wildcard/driver.cxx @@ -2,18 +2,34 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file +#include <cassert> + +#ifndef __cpp_lib_modules #include <map> #include <string> #include <vector> -#include <cassert> -#include <iostream> #include <algorithm> // sort() #include <exception> +#include <iostream> +#endif + +// Other includes. -#include <libbutl/path.hxx> -#include <libbutl/utility.hxx> // operator<<(ostream, exception) -#include <libbutl/optional.hxx> -#include <libbutl/filesystem.hxx> +#ifdef __cpp_modules +#ifdef __cpp_lib_modules +import std.core; +import std.io; +#endif +import butl.path; +import butl.utility; // operator<<(ostream, exception) +import butl.optional; +import butl.filesystem; +#else +#include <libbutl/path.mxx> +#include <libbutl/utility.mxx> +#include <libbutl/optional.mxx> +#include <libbutl/filesystem.mxx> +#endif using namespace std; using namespace butl; |