From 45d51954941328342aecb710133785cefdacfe18 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 15 Jun 2013 03:00:39 +0300 Subject: Mixed mode pch works again. --- test cases/common/15 mixed pch/meson.build | 5 +++-- test cases/common/15 mixed pch/pch/func_pch.c | 1 + test cases/common/15 mixed pch/pch/main.h | 1 + test cases/common/15 mixed pch/pch/main.hh | 1 - test cases/common/15 mixed pch/pch/main_pch.cc | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 test cases/common/15 mixed pch/pch/func_pch.c create mode 100644 test cases/common/15 mixed pch/pch/main.h delete mode 100644 test cases/common/15 mixed pch/pch/main.hh create mode 100644 test cases/common/15 mixed pch/pch/main_pch.cc diff --git a/test cases/common/15 mixed pch/meson.build b/test cases/common/15 mixed pch/meson.build index 8c85672bf..19129d83d 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 000000000..556673988 --- /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.h b/test cases/common/15 mixed pch/pch/main.h new file mode 100644 index 000000000..751cc4a71 --- /dev/null +++ b/test cases/common/15 mixed pch/pch/main.h @@ -0,0 +1 @@ +#include diff --git a/test cases/common/15 mixed pch/pch/main.hh b/test cases/common/15 mixed pch/pch/main.hh deleted file mode 100644 index 751cc4a71..000000000 --- a/test cases/common/15 mixed pch/pch/main.hh +++ /dev/null @@ -1 +0,0 @@ -#include 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 000000000..acd3f574b --- /dev/null +++ b/test cases/common/15 mixed pch/pch/main_pch.cc @@ -0,0 +1 @@ +#include"main.h" -- cgit v1.2.3