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: Addressed failing test: selector index was improperly adjusted.
Created Feb. 7, 2018, 3:49 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 216 if compiler.has_argument('-pthread') | 216 if compiler.has_argument('-pthread') |
| 217 GTEST_PARAMS += '-pthread' | 217 GTEST_PARAMS += '-pthread' |
| 218 LINK_PARAMS += '-lpthread' | 218 LINK_PARAMS += '-lpthread' |
| 219 endif | 219 endif |
| 220 | 220 |
| 221 test_sources = [ | 221 test_sources = [ |
| 222 'test/compiled/abptest.cpp', | 222 'test/compiled/abptest.cpp', |
| 223 'test/compiled/String.cpp', | 223 'test/compiled/String.cpp', |
| 224 'test/compiled/StringMap.cpp', | 224 'test/compiled/StringMap.cpp', |
| 225 'test/compiled/RegExp.cpp', | 225 'test/compiled/RegExp.cpp', |
| 226 'test/compiled/Filter.cpp', | |
| 226 ] | 227 ] |
| 227 | 228 |
| 228 adblockpluscore = static_library('adblockpluscore', shared_sources, | 229 adblockpluscore = static_library('adblockpluscore', shared_sources, |
| 229 native_sources, | 230 native_sources, |
| 230 cpp_args: compiler_args, | 231 cpp_args: compiler_args, |
| 231 link_args: LINK_PARAMS, | 232 link_args: LINK_PARAMS, |
| 232 pic: true) | 233 pic: true) |
| 233 gtest = static_library('gtest', files(join_paths(GTEST_DIR, 'src', 'gtest-all. cc')), | 234 gtest = static_library('gtest', files(join_paths(GTEST_DIR, 'src', 'gtest-all. cc')), |
| 234 include_directories: [ | 235 include_directories: [ |
| 235 include_directories(join_paths(GTEST_DIR, 'include' ), is_system: true), | 236 include_directories(join_paths(GTEST_DIR, 'include' ), is_system: true), |
| 236 include_directories(GTEST_DIR) | 237 include_directories(GTEST_DIR) |
| 237 ], | 238 ], |
| 238 cpp_args: GTEST_PARAMS) | 239 cpp_args: GTEST_PARAMS) |
| 239 abptest = executable('abptest', test_sources, | 240 abptest = executable('abptest', test_sources, |
| 240 cpp_args: compiler_args + ['-DINSIDE_TESTS'], | 241 cpp_args: compiler_args + ['-DINSIDE_TESTS'], |
| 241 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), | 242 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), |
| 242 link_args: LINK_PARAMS, | 243 link_args: LINK_PARAMS, |
| 243 link_with: [ adblockpluscore, gtest ]) | 244 link_with: [ adblockpluscore, gtest ]) |
| 244 test('abptest', abptest) | 245 test('abptest', abptest) |
| 245 endif | 246 endif |
| 246 | 247 |
| OLD | NEW |
« no previous file with comments
|
« compiled/filter/Filter.cpp ('k')
|
test/compiled/Filter.cpp » ('j')
|
no next file with comments »
