diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-08-15 11:33:57 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-08-15 13:18:35 +0300 |
| commit | a90d2925ddfa4e1a19197ca39df8e73d7af6e689 (patch) | |
| tree | 83ea1690eccc787dab83eb1ed7bd1a264c9b362e /test cases/windows | |
| parent | 00bfbcbfa2a5c59f790962b3b1f7e1088fe08947 (diff) | |
| download | meson-a90d2925ddfa4e1a19197ca39df8e73d7af6e689.zip meson-a90d2925ddfa4e1a19197ca39df8e73d7af6e689.tar.gz meson-a90d2925ddfa4e1a19197ca39df8e73d7af6e689.tar.bz2 | |
Revert "compilers/c++: Add MSVC option to make the __cplusplus define accurate"
This reverts commit 0b97d585480e973d8b149618901f7a4ddfa1a906.
Diffstat (limited to 'test cases/windows')
| -rw-r--r-- | test cases/windows/18 msvc cplusplus define/main.cpp | 7 | ||||
| -rw-r--r-- | test cases/windows/18 msvc cplusplus define/meson.build | 14 | ||||
| -rw-r--r-- | test cases/windows/3 cpp/meson.build | 2 |
3 files changed, 1 insertions, 22 deletions
diff --git a/test cases/windows/18 msvc cplusplus define/main.cpp b/test cases/windows/18 msvc cplusplus define/main.cpp deleted file mode 100644 index bc0b1fd..0000000 --- a/test cases/windows/18 msvc cplusplus define/main.cpp +++ /dev/null @@ -1,7 +0,0 @@ -int main() { -#if __cplusplus == 199711L - return 1; -#else - return 0; -#endif -} diff --git a/test cases/windows/18 msvc cplusplus define/meson.build b/test cases/windows/18 msvc cplusplus define/meson.build deleted file mode 100644 index 92cf316..0000000 --- a/test cases/windows/18 msvc cplusplus define/meson.build +++ /dev/null @@ -1,14 +0,0 @@ -project('msvc __cplusplus', 'cpp', default_options : ['cpp_std=c++14']) - -cpp = meson.get_compiler('cpp') - -if cpp.get_id() != 'msvc' - error('MESON_SKIP_TEST: test is only relavent for msvc') -elif meson.project_version().version_compare('< 15.7') - error('MESON_SKIP_TEST: test is only relavent for msvc versions >= 15.7') -endif - -test( - 'main', - executable('main', 'main.cpp'), -) diff --git a/test cases/windows/3 cpp/meson.build b/test cases/windows/3 cpp/meson.build index a9e6569..7b8080e 100644 --- a/test cases/windows/3 cpp/meson.build +++ b/test cases/windows/3 cpp/meson.build @@ -1,4 +1,4 @@ -project('wincpp', 'cpp', default_options : ['cpp_std=c++14']) +project('wincpp', 'cpp') exe = executable('prog', 'prog.cpp') test('wincpp', exe) |