diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/expression-test.cmake | 2 | ||||
| -rw-r--r-- | cmake/node.cmake | 8 | ||||
| -rw-r--r-- | cmake/render-test.cmake | 58 |
3 files changed, 51 insertions, 17 deletions
diff --git a/cmake/expression-test.cmake b/cmake/expression-test.cmake index 6c5b71a4f6..da4f90d751 100644 --- a/cmake/expression-test.cmake +++ b/cmake/expression-test.cmake @@ -3,6 +3,8 @@ add_executable(mbgl-expression-test expression-test/expression_test_parser.cpp expression-test/expression_test_runner.cpp expression-test/expression_test_logger.cpp + expression-test/test_runner_common.cpp + expression-test/test_runner_common.hpp ) if(APPLE) diff --git a/cmake/node.cmake b/cmake/node.cmake index a791d99b42..1e01c8edba 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -20,13 +20,13 @@ create_source_groups(mbgl-loop-node) add_node_module(mbgl-node INSTALL_PATH "lib/{node_abi}/mbgl.node" - NAN_VERSION "2.10.0" - - # Don't build for Node 4.x, 5.x, 7.x, 9.x, 11.x and 12.x + NAN_VERSION "2.14.0" + + # Don't build for Node 4.x, 5.x, 7.x, 9.x, 11.x, 12.x and 13.x # See https://nodejs.org/en/download/releases/ for mapping of Node version to ABI number. # Changes to this property should happen in tandem with updates to the version targets # in platform/node/scripts/publish.sh and the "node" engines property in package.json. - EXCLUDE_NODE_ABIS 46 47 51 59 67 72 + EXCLUDE_NODE_ABIS 46 47 51 59 67 72 79 ) target_sources(mbgl-node INTERFACE diff --git a/cmake/render-test.cmake b/cmake/render-test.cmake index 7369655630..ac17be559c 100644 --- a/cmake/render-test.cmake +++ b/cmake/render-test.cmake @@ -1,30 +1,62 @@ -add_executable(mbgl-render-test +add_executable( + mbgl-render-test + expression-test/test_runner_common.cpp + expression-test/test_runner_common.hpp + platform/default/src/mbgl/render-test/main.cpp render-test/allocation_index.cpp - render-test/main.cpp + render-test/allocation_index.hpp + render-test/filesystem.hpp + render-test/filesystem.hpp + render-test/include/mbgl/render_test.hpp + render-test/manifest_parser.cpp + render-test/manifest_parser.hpp + render-test/metadata.hpp render-test/parser.cpp + render-test/parser.hpp + render-test/render_test.cpp render-test/runner.cpp + render-test/runner.hpp ) if(APPLE) - target_link_libraries(mbgl-render-test PRIVATE mbgl-loop-darwin) + target_link_libraries( + mbgl-render-test + PRIVATE mbgl-loop-darwin + ) else() - target_link_libraries(mbgl-render-test PRIVATE mbgl-loop-uv) + target_link_libraries( + mbgl-render-test + PRIVATE mbgl-loop-uv + ) endif() -target_include_directories(mbgl-render-test +target_include_directories( + mbgl-render-test PRIVATE src PRIVATE platform/default/include PRIVATE render-test ) -target_link_libraries(mbgl-render-test PRIVATE - mbgl-core - mbgl-filesource - Mapbox::Base::Extras::args - mbgl-vendor-expected - Mapbox::Base::Extras::filesystem - Mapbox::Base::pixelmatch-cpp - Mapbox::Base::Extras::rapidjson +target_include_directories( + mbgl-render-test + PUBLIC render-test/include + PUBLIC include ) +target_link_libraries( + mbgl-render-test + PRIVATE + mbgl-core + mbgl-filesource + Mapbox::Base::Extras::args + mbgl-vendor-expected + Mapbox::Base::Extras::filesystem + Mapbox::Base::pixelmatch-cpp + Mapbox::Base::Extras::rapidjson +) + +create_source_groups(mbgl-render-test) + +set_target_properties(mbgl-render-test PROPERTIES FOLDER "Executables") + add_definitions(-DTEST_RUNNER_ROOT_PATH="${CMAKE_SOURCE_DIR}") |