From c09cd7512491cee1e82c1ad8128ce9fd4bc3f79b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 22 Sep 2017 23:32:28 +0200 Subject: Initial modularization with both Clang and VC hacks Note: gave up on VC about half way though. --- tests/process/buildfile | 6 ++++++ tests/process/driver.cxx | 27 ++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) (limited to 'tests/process') diff --git a/tests/process/buildfile b/tests/process/buildfile index ddb4688..2ecc915 100644 --- a/tests/process/buildfile +++ b/tests/process/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/process/driver.cxx b/tests/process/driver.cxx index 0338af2..01f2c30 100644 --- a/tests/process/driver.cxx +++ b/tests/process/driver.cxx @@ -4,17 +4,34 @@ #include // getenv(), setenv(), _putenv() +#include + +#ifndef __cpp_lib_modules #include #include #include -#include -#include #include // istreambuf_iterator, ostream_iterator #include // copy() +#include +#endif + +// Other includes. -#include -#include -#include +#ifdef __cpp_modules +#ifdef __cpp_lib_modules +import std.core; +import std.io; +#endif +import butl.path; +import butl.process; +import butl.optional; +import butl.fdstream; +#else +#include +#include +#include +#include +#endif using namespace std; using namespace butl; -- cgit v1.1