summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-02-21 13:22:03 -0800
committerKonstantin Käfer <mail@kkaefer.com>2017-03-28 13:53:19 +0200
commita3c8fcda9c82bf5602e75e6c4c9ee813134413c7 (patch)
treeb7598151c65d868c8c76d362ab502f46693b4412
parent15833a6b789b7ed341a807ab083d3acf9a9fa1a8 (diff)
downloadqtlocation-mapboxgl-a3c8fcda9c82bf5602e75e6c4c9ee813134413c7.tar.gz
[core] Core tests and benchmarks are allowed to include via src
-rw-r--r--cmake/benchmark.cmake2
-rw-r--r--cmake/test.cmake2
-rw-r--r--platform/android/config.cmake2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake
index 0752647a2d..c3b5c93937 100644
--- a/cmake/benchmark.cmake
+++ b/cmake/benchmark.cmake
@@ -8,7 +8,7 @@ target_compile_options(mbgl-benchmark
target_include_directories(mbgl-benchmark
PRIVATE include
- PRIVATE src # TODO: eliminate
+ PRIVATE src
PRIVATE benchmark/include
PRIVATE benchmark/src
PRIVATE platform/default
diff --git a/cmake/test.cmake b/cmake/test.cmake
index 2a83a633c0..1f3bd42c63 100644
--- a/cmake/test.cmake
+++ b/cmake/test.cmake
@@ -10,7 +10,7 @@ set_source_files_properties(test/src/mbgl/test/util.cpp PROPERTIES COMPILE_FLAGS
target_include_directories(mbgl-test
PRIVATE include
- PRIVATE src # TODO: eliminate
+ PRIVATE src
PRIVATE test/include
PRIVATE test/src
PRIVATE platform/default
diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index 1a68ee065d..1c77068a81 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -278,7 +278,7 @@ target_compile_definitions(mbgl-test
target_include_directories(mbgl-test
PRIVATE include
- PRIVATE src # TODO: eliminate
+ PRIVATE src
PRIVATE test/include
PRIVATE test/src
PRIVATE platform/default