Fix diag builtin calls in ad hoc recipes

1 files changed, 25 insertions, 22 deletions

diff --git a/xsd-tests/build/root.build b/xsd-tests/build/root.build
index 63c3bb4..258d4eb 100644
--- a/xsd-tests/build/root.build
+++ b/xsd-tests/build/root.build
@@ -1,15 +1,6 @@
 # file      : build/root.build
 # license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
-define xsd: file
-xsd{*}: extension = xsd
-
-define xml: file
-xml{*}: extension = xml
-
-define map: file
-map{*}: extension = map
-
 using in
 
 cxx.std = latest
@@ -21,20 +12,32 @@ ixx{*}: extension = ixx
 txx{*}: extension = txx
 cxx{*}: extension = cxx
 
-if ($cxx.target.system == 'win32-msvc')
-  cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+if ($build.mode != 'skeleton')
+{
+  define xsd: file
+  xsd{*}: extension = xsd
+
+  define xml: file
+  xml{*}: extension = xml
+
+  define map: file
+  map{*}: extension = map
+
+  if ($cxx.target.system == 'win32-msvc')
+    cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
 
-if ($cxx.class == 'msvc')
-  cxx.coptions += /wd4251 /wd4275 /wd4800
+  if ($cxx.class == 'msvc')
+    cxx.coptions += /wd4251 /wd4275 /wd4800
 
-# Setup the xsd that we are testing.
-#
-import xsd = xsd%exe{xsd}
+  # Import xsd that we are testing.
+  #
+  import! [metadata] xsd = xsd%exe{xsd}
 
-# Every exe{} in this project is by default a test.
-#
-exe{*}: test = true
+  # Every exe{} in this project is by default a test.
+  #
+  exe{*}: test = true
 
-# Specify the test target for cross-testing.
-#
-test.target = $cxx.target
+  # Specify the test target for cross-testing.
+  #
+  test.target = $cxx.target
+}