CMake cleanups

Author: hjanetzek

bench/CMakeLists.txt

@@ -32,6 +32,7 @@ foreach(_src_file_path ${BENCH_SOURCES})
   )
 
   target_link_libraries(${EXECUTABLE_NAME}
+  PRIVATE
     tangram-core
     benchmark
     platform_mock

core/CMakeLists.txt

@@ -6,7 +6,6 @@ add_subdirectory(deps)
 if (TANGRAM_MBTILES_DATASOURCE)
   set(MBTILES_SOURCES src/data/mbtilesDataSource.cpp)
   set(MBTILES_LIBS SQLiteCpp sqlite3)
-  add_definitions(-DTANGRAM_MBTILES_DATASOURCE)
 endif()
 
 add_library(tangram-core
@@ -149,7 +148,15 @@ if(UNIX AND NOT APPLE)
 endif()
 
 if(TANGRAM_WARN_ON_RULE_CONFLICT)
-  add_definitions(-DTANGRAM_WARN_ON_RULE_CONFLICT)
+  target_compile_definitions(tangram-core
+    PRIVATE
+    TANGRAM_WARN_ON_RULE_CONFLICT)
+endif()
+
+if (TANGRAM_MBTILES_DATASOURCE)
+  target_compile_definitions(tangram-core
+    PRIVATE
+    TANGRAM_MBTILES_DATASOURCE)
 endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")

platforms/android/tangram/build.gradle

@@ -39,7 +39,10 @@ android {
                  '-Wignored-qualifiers',
                  '-Wtype-limits',
                  '-Wmissing-field-initializers',
-                 '-Wno-format-pedantic'
+                 '-Wno-format-pedantic',
+                 '-Wno-gnu-statement-expression',
+                 '-Wgnu-anonymous-struct',
+                 '-Wno-nested-anon-types'
 
         if (abi == 'all') {
           abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86'

platforms/linux/config.cmake

@@ -19,8 +19,6 @@ check_unsupported_compiler_version()
 
 add_definitions(-DTANGRAM_LINUX)
 
-get_nextzen_api_key(NEXTZEN_API_KEY)
-add_definitions(-DNEXTZEN_API_KEY="${NEXTZEN_API_KEY}")
 
 find_package(OpenGL REQUIRED)
 
@@ -75,4 +73,10 @@ target_compile_options(tangram
   -Wmissing-field-initializers
 )
 
+get_nextzen_api_key(NEXTZEN_API_KEY)
+target_compile_definitions(tangram
+  PRIVATE
+  NEXTZEN_API_KEY="${NEXTZEN_API_KEY}")
+
+
 add_resources(tangram "${PROJECT_SOURCE_DIR}/scenes" "res")