aboutsummaryrefslogtreecommitdiff
path: root/tests/link
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-09-22 23:32:28 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-09-22 23:32:28 +0200
commitc09cd7512491cee1e82c1ad8128ce9fd4bc3f79b (patch)
treea659ed768d849130ab5780a11b7f791a463a1a91 /tests/link
parent2a00871f07067f8f9e2de08bb9c8f50e1bf6a650 (diff)
Initial modularization with both Clang and VC hacks
Note: gave up on VC about half way though.
Diffstat (limited to 'tests/link')
-rw-r--r--tests/link/buildfile6
-rw-r--r--tests/link/driver.cxx22
2 files changed, 24 insertions, 4 deletions
diff --git a/tests/link/buildfile b/tests/link/buildfile
index 9d4f6b5..17e3eac 100644
--- a/tests/link/buildfile
+++ b/tests/link/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
diff --git a/tests/link/driver.cxx b/tests/link/driver.cxx
index a5e94bb..352cadd 100644
--- a/tests/link/driver.cxx
+++ b/tests/link/driver.cxx
@@ -2,14 +2,28 @@
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
-#include <set>
#include <cassert>
+
+#ifndef __cpp_lib_modules
+#include <set>
#include <utility> // pair
#include <system_error>
+#endif
-#include <libbutl/path.hxx>
-#include <libbutl/fdstream.hxx>
-#include <libbutl/filesystem.hxx>
+// Other includes.
+
+#ifdef __cpp_modules
+#ifdef __cpp_lib_modules
+import std.core;
+#endif
+import butl.path;
+import butl.fdstream;
+import butl.filesystem;
+#else
+#include <libbutl/path.mxx>
+#include <libbutl/fdstream.mxx>
+#include <libbutl/filesystem.mxx>
+#endif
using namespace std;
using namespace butl;