diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-07 13:00:45 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-07 13:49:16 +0200 |
| commit | 402bb6e6b297614226c4f848ebdb13fd49a95d76 (patch) | |
| tree | 0a8a59e2bf1b7c0d6d7efb1dcf7e9bee1bea76cc /tests/amalgam | |
| parent | 49d5628e35593a5300d39596286c768d7aa435b6 (diff) | |
Relax requirement on amalgamation src_root to track sub-project
Diffstat (limited to 'tests/amalgam')
| -rw-r--r-- | tests/amalgam/config/build/bootstrap.build | 3 | ||||
| -rw-r--r-- | tests/amalgam/config/build/root.build | 1 | ||||
| -rw-r--r-- | tests/amalgam/config/buildfile | 3 | ||||
| -rw-r--r-- | tests/amalgam/simple/build/bootstrap.build | 3 | ||||
| -rw-r--r-- | tests/amalgam/simple/buildfile | 9 | ||||
| -rw-r--r-- | tests/amalgam/simple/driver.cxx | 4 |
6 files changed, 23 insertions, 0 deletions
diff --git a/tests/amalgam/config/build/bootstrap.build b/tests/amalgam/config/build/bootstrap.build new file mode 100644 index 0000000..5951f06 --- /dev/null +++ b/tests/amalgam/config/build/bootstrap.build @@ -0,0 +1,3 @@ +project = amalgam-config +subprojects = 1/ 2/ +using config diff --git a/tests/amalgam/config/build/root.build b/tests/amalgam/config/build/root.build new file mode 100644 index 0000000..7d1767b --- /dev/null +++ b/tests/amalgam/config/build/root.build @@ -0,0 +1 @@ +using cxx diff --git a/tests/amalgam/config/buildfile b/tests/amalgam/config/buildfile new file mode 100644 index 0000000..e9fc7f4 --- /dev/null +++ b/tests/amalgam/config/buildfile @@ -0,0 +1,3 @@ +d = 1/ 2/ +.: $d +include $d diff --git a/tests/amalgam/simple/build/bootstrap.build b/tests/amalgam/simple/build/bootstrap.build new file mode 100644 index 0000000..8da7272 --- /dev/null +++ b/tests/amalgam/simple/build/bootstrap.build @@ -0,0 +1,3 @@ +project = amalgam-simple +amalgamation = ../ +using config diff --git a/tests/amalgam/simple/buildfile b/tests/amalgam/simple/buildfile new file mode 100644 index 0000000..ec6a4e1 --- /dev/null +++ b/tests/amalgam/simple/buildfile @@ -0,0 +1,9 @@ +using cxx + +hxx.ext = hxx +cxx.ext = cxx +ixx.ext = ixx + +cxx.poptions += -I$out_root + +exe{driver}: cxx{driver} diff --git a/tests/amalgam/simple/driver.cxx b/tests/amalgam/simple/driver.cxx new file mode 100644 index 0000000..70b4146 --- /dev/null +++ b/tests/amalgam/simple/driver.cxx @@ -0,0 +1,4 @@ +int +main () +{ +} |