From 929377e738556664609483e1fa0ee0deb8cdb794 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 8 Oct 2019 15:06:38 +0300 Subject: Adapt for building with Clang on Windows --- build/.gitignore | 3 +++ build/root.build | 6 +++--- tests/.gitignore | 1 + tests/build/.gitignore | 3 +++ tests/build/root.build | 6 +++--- 5 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 build/.gitignore create mode 100644 tests/.gitignore create mode 100644 tests/build/.gitignore diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 0000000..4a730a3 --- /dev/null +++ b/build/.gitignore @@ -0,0 +1,3 @@ +config.build +root/ +bootstrap/ diff --git a/build/root.build b/build/root.build index 0cdf286..653ded7 100644 --- a/build/root.build +++ b/build/root.build @@ -11,8 +11,8 @@ 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 -} diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..e54525b --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1 @@ +driver diff --git a/tests/build/.gitignore b/tests/build/.gitignore new file mode 100644 index 0000000..4a730a3 --- /dev/null +++ b/tests/build/.gitignore @@ -0,0 +1,3 @@ +config.build +root/ +bootstrap/ diff --git a/tests/build/root.build b/tests/build/root.build index 216fa84..da6ff40 100644 --- a/tests/build/root.build +++ b/tests/build/root.build @@ -9,11 +9,11 @@ using cxx hxx{*}: extension = hxx 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 -} # Every exe{} in this subproject is by default a test. # -- cgit v1.1