diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-01-18 15:17:07 +0100 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-01-18 19:06:32 +0100 |
| commit | 49da57393a5c5ddff1a7f60620c38858643b1220 (patch) | |
| tree | ab03d4176afac09f8b19e79cd54c852cc65a59ba | |
| parent | c637a658db64c69c6052836790f5e6ef7bcda69c (diff) | |
| download | qtlocation-mapboxgl-49da57393a5c5ddff1a7f60620c38858643b1220.tar.gz | |
[core] Remove platform-specific main.cpp from MBGL_TEST_FILES
| -rw-r--r-- | cmake/test-files.cmake | 3 | ||||
| -rw-r--r-- | platform/default/mbgl/test/main.cpp (renamed from test/src/main.cpp) | 0 | ||||
| -rw-r--r-- | platform/linux/config.cmake | 4 | ||||
| -rw-r--r-- | platform/macos/config.cmake | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index bf908e758c..5d2b63d13f 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -43,9 +43,6 @@ set(MBGL_TEST_FILES test/sprite/sprite_image.test.cpp test/sprite/sprite_parser.test.cpp - # src - test/src/main.cpp - # src/mbgl/test test/src/mbgl/test/conversion_stubs.hpp test/src/mbgl/test/fake_file_source.hpp diff --git a/test/src/main.cpp b/platform/default/mbgl/test/main.cpp index d01cf75ffc..d01cf75ffc 100644 --- a/test/src/main.cpp +++ b/platform/default/mbgl/test/main.cpp diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index bad3751b06..5e0f07073c 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -132,11 +132,11 @@ endmacro() macro(mbgl_platform_test) target_sources(mbgl-test - PRIVATE test/src/main.cpp + PRIVATE platform/default/mbgl/test/main.cpp ) set_source_files_properties( - test/src/main.cpp + platform/default/mbgl/test/main.cpp PROPERTIES COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}" ) diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index 2e4b7a01b2..ced1121cca 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -111,11 +111,11 @@ endmacro() macro(mbgl_platform_test) target_sources(mbgl-test - PRIVATE test/src/main.cpp + PRIVATE platform/default/mbgl/test/main.cpp ) set_source_files_properties( - test/src/main.cpp + platform/default/mbgl/test/main.cpp PROPERTIES COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}" ) |