From be934b66940a2279b464fee4814fb20b34b97fc3 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 8 Oct 2019 12:30:53 +0300 Subject: Adapt for building with Clang on Windows --- build/root.build | 6 +++--- examples/build/root.build | 6 ++++++ tests/build/root.build | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/build/root.build b/build/root.build index 23435af..924e2e5 100644 --- a/build/root.build +++ b/build/root.build @@ -11,11 +11,11 @@ ixx{*}: extension = ixx txx{*}: extension = txx cxx{*}: extension = cxx -if ($cxx.class == 'msvc') -{ +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 -} cxx.poptions =+ "-I$out_root" "-I$src_root" diff --git a/examples/build/root.build b/examples/build/root.build index 965bf55..8d67f2f 100644 --- a/examples/build/root.build +++ b/examples/build/root.build @@ -11,6 +11,12 @@ 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 ($cxx.class == 'msvc') + cxx.coptions += /wd4251 /wd4275 /wd4800 + # Load cli module. It must be available from the system or from the base # project. Generating files with cli is a part of the examples, so distributing # pre-generated files would be meaningless. diff --git a/tests/build/root.build b/tests/build/root.build index 42d4876..3583d07 100644 --- a/tests/build/root.build +++ b/tests/build/root.build @@ -11,11 +11,11 @@ ixx{*}: extension = ixx txx{*}: extension = txx cxx{*}: extension = cxx -if ($cxx.class == 'msvc') -{ +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 -} # Load cli module. It must be available from the system or from the base # project. Generating files with cli is a part of the tests, so distributing -- cgit v1.1