Unified Diff: meson.build
Issue 29684686:
Noissue - fix native tests (Closed)
Base URL: github.com:adblockplus/adblockpluscore
Patch Set:
Created Jan. 30, 2018, 2:26 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: meson.build |
| diff --git a/meson.build b/meson.build |
| index 89752ce358898a00188903e7692ff8e76f0622df..2e2b777e95d975f799e9fab363e9102191402329 100644 |
| --- a/meson.build |
| +++ b/meson.build |
| @@ -192,11 +192,12 @@ if target_type == 'js' |
| '@INPUT@' |
| ] + compiler_args + optional_args) |
| else |
| - GTEST_DIR = join_paths('third-party', 'googletest', 'googletest') |
| + GTEST_DIR = join_paths('third_party', 'googletest', 'googletest') |
|
hub
2018/01/30 15:13:22
*sigh* there was a change at one point (when I add
|
| GTEST_PARAMS = [] |
| compiler = meson.get_compiler('cpp') |
| if compiler.has_argument('-pthread') |
| GTEST_PARAMS += '-pthread' |
| + LINK_PARAMS += '-lpthread' |
| endif |
| test_sources = [ |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
