Side by Side Diff: meson.build
Issue 29595633:
Issue 5870 - Implement the new ElemHideEmulation filter type (Closed)
Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Reworked the logic and added tests
Created Jan. 31, 2018, 9:07 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« compiled/filter/ElemHideBase.cpp ('K')
|
« compiled/filter/Filter.cpp ('k')
|
test/compiled/Filter.cpp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 project('adblockpluscore', 'cpp', license: ['GPL3'], meson_version: '>0.40.0') | 1 project('adblockpluscore', 'cpp', license: ['GPL3'], meson_version: '>0.40.0') |
| 2 | 2 |
| 3 native = get_option('native') | 3 native = get_option('native') |
| 4 if native | 4 if native |
| 5 target_type='native' | 5 target_type='native' |
| 6 else | 6 else |
| 7 target_type='js' | 7 target_type='js' |
| 8 endif | 8 endif |
| 9 | 9 |
| 10 if target_type == 'js' | 10 if target_type == 'js' |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 199 if compiler.has_argument('-pthread') | 199 if compiler.has_argument('-pthread') |
| 200 GTEST_PARAMS += '-pthread' | 200 GTEST_PARAMS += '-pthread' |
| 201 LINK_PARAMS += '-lpthread' | 201 LINK_PARAMS += '-lpthread' |
| 202 endif | 202 endif |
| 203 | 203 |
| 204 test_sources = [ | 204 test_sources = [ |
| 205 'test/compiled/abptest.cpp', | 205 'test/compiled/abptest.cpp', |
| 206 'test/compiled/String.cpp', | 206 'test/compiled/String.cpp', |
| 207 'test/compiled/StringMap.cpp', | 207 'test/compiled/StringMap.cpp', |
| 208 'test/compiled/RegExp.cpp', | 208 'test/compiled/RegExp.cpp', |
| 209 'test/compiled/Filter.cpp', | |
| 209 ] | 210 ] |
| 210 | 211 |
| 211 adblockpluscore = library('adblockpluscore', shared_sources, | 212 adblockpluscore = library('adblockpluscore', shared_sources, |
| 212 native_sources, | 213 native_sources, |
| 213 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS, | 214 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS, |
| 214 link_args: LINK_PARAMS) | 215 link_args: LINK_PARAMS) |
| 215 gtest = static_library('gtest', files(join_paths(GTEST_DIR, 'src', 'gtest-all. cc')), | 216 gtest = static_library('gtest', files(join_paths(GTEST_DIR, 'src', 'gtest-all. cc')), |
| 216 include_directories: [ | 217 include_directories: [ |
| 217 include_directories(join_paths(GTEST_DIR, 'include' ), is_system: true), | 218 include_directories(join_paths(GTEST_DIR, 'include' ), is_system: true), |
| 218 include_directories(GTEST_DIR) | 219 include_directories(GTEST_DIR) |
| 219 ], | 220 ], |
| 220 cpp_args: GTEST_PARAMS) | 221 cpp_args: GTEST_PARAMS) |
| 221 abptest = executable('abptest', test_sources, | 222 abptest = executable('abptest', test_sources, |
| 222 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS + ['-DINSIDE_TE STS'], | 223 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS + ['-DINSIDE_TE STS'], |
| 223 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), | 224 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), |
| 224 link_args: LINK_PARAMS, | 225 link_args: LINK_PARAMS, |
| 225 link_with: [ adblockpluscore, gtest ]) | 226 link_with: [ adblockpluscore, gtest ]) |
| 226 test('abptest', abptest) | 227 test('abptest', abptest) |
| 227 endif | 228 endif |
| 228 | 229 |
| OLD | NEW |
« compiled/filter/ElemHideBase.cpp ('K')
|
« compiled/filter/Filter.cpp ('k')
|
test/compiled/Filter.cpp » ('j')
|
no next file with comments »
