diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-06-15 03:00:39 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-06-15 03:00:39 +0300 |
| commit | 45d51954941328342aecb710133785cefdacfe18 (patch) | |
| tree | ddece82427e7da25f354cc12b3d7508e3840460b | |
| parent | 7e6d8454a4545dc26916e8db0d718d6d66369bd4 (diff) | |
| download | meson-45d51954941328342aecb710133785cefdacfe18.zip meson-45d51954941328342aecb710133785cefdacfe18.tar.gz meson-45d51954941328342aecb710133785cefdacfe18.tar.bz2 | |
Mixed mode pch works again.
| -rw-r--r-- | test cases/common/15 mixed pch/meson.build | 5 | ||||
| -rw-r--r-- | test cases/common/15 mixed pch/pch/func_pch.c | 1 | ||||
| -rw-r--r-- | test cases/common/15 mixed pch/pch/main.h (renamed from test cases/common/15 mixed pch/pch/main.hh) | 0 | ||||
| -rw-r--r-- | test cases/common/15 mixed pch/pch/main_pch.cc | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/test cases/common/15 mixed pch/meson.build b/test cases/common/15 mixed pch/meson.build index 8c85672..19129d8 100644 --- a/test cases/common/15 mixed pch/meson.build +++ b/test cases/common/15 mixed pch/meson.build @@ -1,5 +1,6 @@ project('mixed C and C++ pch test', 'cpp', 'c') -pch = ['pch/main.hh', 'pch/func.h'] -exe = executable('prog', 'main.cc', 'func.c', pch : pch) +exe = executable('prog', 'main.cc', 'func.c', +c_pch : ['pch/func.h', 'pch/func_pch.c'], +cpp_pch : ['pch/main_pch.cc', 'pch/main.h']) diff --git a/test cases/common/15 mixed pch/pch/func_pch.c b/test cases/common/15 mixed pch/pch/func_pch.c new file mode 100644 index 0000000..5566739 --- /dev/null +++ b/test cases/common/15 mixed pch/pch/func_pch.c @@ -0,0 +1 @@ +#include"func.h" diff --git a/test cases/common/15 mixed pch/pch/main.hh b/test cases/common/15 mixed pch/pch/main.h index 751cc4a..751cc4a 100644 --- a/test cases/common/15 mixed pch/pch/main.hh +++ b/test cases/common/15 mixed pch/pch/main.h diff --git a/test cases/common/15 mixed pch/pch/main_pch.cc b/test cases/common/15 mixed pch/pch/main_pch.cc new file mode 100644 index 0000000..acd3f57 --- /dev/null +++ b/test cases/common/15 mixed pch/pch/main_pch.cc @@ -0,0 +1 @@ +#include"main.h" |