Delta Between Two Patch Sets: meson.build
Issue 29595633:
Issue 5870 - Implement the new ElemHideEmulation filter type (Closed)
Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Rebased patch. Fix assertion.
Created Nov. 27, 2017, 3:13 p.m.
Right Patch Set: Deal with ill formed filters.
Created Feb. 14, 2018, 5:05 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 change/comment »
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')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 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 asan = get_option('asan') | 9 asan = get_option('asan') |
| 10 | 10 |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 221 if compiler.has_argument('-pthread') | 221 if compiler.has_argument('-pthread') |
| 222 GTEST_PARAMS += '-pthread' | 222 GTEST_PARAMS += '-pthread' |
| 223 LINK_PARAMS += '-lpthread' | 223 LINK_PARAMS += '-lpthread' |
| 224 endif | 224 endif |
| 225 | 225 |
| 226 test_sources = [ | 226 test_sources = [ |
| 227 'test/compiled/abptest.cpp', | 227 'test/compiled/abptest.cpp', |
| 228 'test/compiled/String.cpp', | 228 'test/compiled/String.cpp', |
| 229 'test/compiled/StringMap.cpp', | 229 'test/compiled/StringMap.cpp', |
| 230 'test/compiled/RegExp.cpp', | 230 'test/compiled/RegExp.cpp', |
| 231 'test/compiled/Filter.cpp', | |
| 231 ] | 232 ] |
| 232 | 233 |
| 233 adblockpluscore = static_library('adblockpluscore', shared_sources, | 234 adblockpluscore = static_library('adblockpluscore', shared_sources, |
| 234 native_sources, | 235 native_sources, |
| 235 cpp_args: compiler_args, | 236 cpp_args: compiler_args, |
| 236 link_args: LINK_PARAMS, | 237 link_args: LINK_PARAMS, |
| 237 pic: true) | 238 pic: true) |
| 238 gtest = static_library('gtest', files(join_paths(GTEST_DIR, 'src', 'gtest-all. cc')), | 239 gtest = static_library('gtest', files(join_paths(GTEST_DIR, 'src', 'gtest-all. cc')), |
| 239 include_directories: [ | 240 include_directories: [ |
| 240 include_directories(join_paths(GTEST_DIR, 'include' ), is_system: true), | 241 include_directories(join_paths(GTEST_DIR, 'include' ), is_system: true), |
| 241 include_directories(GTEST_DIR) | 242 include_directories(GTEST_DIR) |
| 242 ], | 243 ], |
| 243 cpp_args: GTEST_PARAMS) | 244 cpp_args: GTEST_PARAMS) |
| 244 abptest = executable('abptest', test_sources, | 245 abptest = executable('abptest', test_sources, |
| 245 cpp_args: compiler_args + ['-DINSIDE_TESTS'], | 246 cpp_args: compiler_args + ['-DINSIDE_TESTS'], |
| 246 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), | 247 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), |
| 247 link_args: LINK_PARAMS, | 248 link_args: LINK_PARAMS, |
| 248 link_with: [ adblockpluscore, gtest ]) | 249 link_with: [ adblockpluscore, gtest ]) |
| 249 test('abptest', abptest) | 250 test('abptest', abptest) |
| 250 endif | 251 endif |
| 251 | 252 |
| LEFT | RIGHT |
« compiled/filter/Filter.cpp ('k')
|
test/compiled/Filter.cpp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
