diff --git a/CMakeLists.txt b/CMakeLists.txt index 6525df594..350f1816c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -991,8 +991,8 @@ if(MLN_WITH_OPENGL) message(STATUS "Configuring GL-Native with OpenGL renderer backend") target_compile_definitions( mbgl-core - PRIVATE MLN_RENDER_BACKEND_OPENGL=1 PUBLIC + MLN_RENDER_BACKEND_OPENGL=1 "MLN_USE_UNORDERED_DENSE=$" ) list(APPEND @@ -1136,8 +1136,8 @@ if(MLN_WITH_METAL) message(STATUS "Configuring Metal renderer backend") target_compile_definitions( mbgl-core - PRIVATE MLN_RENDER_BACKEND_METAL=1 PUBLIC + MLN_RENDER_BACKEND_METAL=1 "MLN_USE_UNORDERED_DENSE=$" ) list(APPEND @@ -1235,7 +1235,7 @@ if(MLN_WITH_VULKAN) target_compile_definitions( mbgl-core - PRIVATE + PUBLIC MLN_RENDER_BACKEND_VULKAN=1 ) diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index 818ab90e0..c848e6864 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -61,7 +61,3 @@ target_link_libraries( ) set_property(TARGET mbgl-benchmark PROPERTY FOLDER MapLibre) - -if(MLN_WITH_OPENGL) - target_compile_definitions(mbgl-benchmark PRIVATE "MLN_RENDER_BACKEND_OPENGL=1") -endif() diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 7dca72a53..351d9e55b 100644 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -56,7 +56,3 @@ install(TARGETS mbgl-offline mbgl-render RUNTIME DESTINATION bin) # ${PROJECT_SOURCE_DIR} ) # # add_test(NAME mbgl-render-tool-test COMMAND mbgl-render WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} ) - -if(MLN_WITH_OPENGL) - target_compile_definitions(mbgl-render PRIVATE "MLN_RENDER_BACKEND_OPENGL=1") -endif() diff --git a/platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt b/platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt index c156aa756..8a1d934ba 100644 --- a/platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt +++ b/platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt @@ -205,10 +205,6 @@ if(MLN_WITH_OPENGL) ${PROJECT_SOURCE_DIR}/android_gl_renderer_backend.cpp ${PROJECT_SOURCE_DIR}/android_gl_renderer_backend.hpp ) - target_compile_definitions( - maplibre - PRIVATE MLN_RENDER_BACKEND_OPENGL=1 - ) endif() if(MLN_WITH_VULKAN) @@ -217,10 +213,6 @@ if(MLN_WITH_VULKAN) ${PROJECT_SOURCE_DIR}/android_vulkan_renderer_backend.cpp ${PROJECT_SOURCE_DIR}/android_vulkan_renderer_backend.hpp ) - target_compile_definitions( - maplibre - PRIVATE MLN_RENDER_BACKEND_VULKAN=1 - ) endif() target_include_directories( diff --git a/platform/darwin/darwin.cmake b/platform/darwin/darwin.cmake index 4217aa752..7f25019eb 100644 --- a/platform/darwin/darwin.cmake +++ b/platform/darwin/darwin.cmake @@ -172,13 +172,6 @@ target_link_libraries( PRIVATE mbgl-compiler-options mbgl-core ) -if(MLN_WITH_METAL) - target_compile_definitions( - custom-layer-examples - PRIVATE MLN_RENDER_BACKEND_METAL=1 - ) -endif() - target_include_directories( custom-layer-examples PUBLIC diff --git a/platform/glfw/CMakeLists.txt b/platform/glfw/CMakeLists.txt index 5515704ef..aea224a0d 100644 --- a/platform/glfw/CMakeLists.txt +++ b/platform/glfw/CMakeLists.txt @@ -37,10 +37,6 @@ if(MLN_WITH_OPENGL) mbgl-glfw PRIVATE ${PROJECT_SOURCE_DIR}/platform/glfw/glfw_gl_backend.cpp ) - target_compile_definitions( - mbgl-glfw - PRIVATE MLN_RENDER_BACKEND_OPENGL=1 - ) endif() if(MLN_WITH_EGL) @@ -55,11 +51,6 @@ if(MLN_WITH_VULKAN) mbgl-glfw PRIVATE ${PROJECT_SOURCE_DIR}/platform/glfw/glfw_vulkan_backend.cpp ) - - target_compile_definitions( - mbgl-glfw - PRIVATE MLN_RENDER_BACKEND_VULKAN=1 - ) endif() if(MLN_WITH_METAL) @@ -71,10 +62,6 @@ if(MLN_WITH_METAL) ${PROJECT_SOURCE_DIR}/platform/glfw/glfw_metal_backend.h ${PROJECT_SOURCE_DIR}/platform/glfw/metal_backend.h ) - target_compile_definitions( - mbgl-glfw - PRIVATE MLN_RENDER_BACKEND_METAL=1 - ) target_link_libraries( mbgl-glfw PRIVATE diff --git a/platform/ios/ios.cmake b/platform/ios/ios.cmake index dddced247..78ea7f6a6 100644 --- a/platform/ios/ios.cmake +++ b/platform/ios/ios.cmake @@ -90,10 +90,6 @@ set_target_properties(ios-sdk-static PROPERTIES if(MLN_WITH_METAL) message(STATUS "Configuring Metal renderer backend") - target_compile_definitions( - ios-sdk-static - PRIVATE MLN_RENDER_BACKEND_METAL=1 - ) endif() target_include_directories( diff --git a/render-test/CMakeLists.txt b/render-test/CMakeLists.txt index 3296a21c1..545ecb4ef 100644 --- a/render-test/CMakeLists.txt +++ b/render-test/CMakeLists.txt @@ -65,7 +65,3 @@ target_link_libraries( ) set_property(TARGET mbgl-render-test PROPERTY FOLDER MapLibre) - -if(MLN_WITH_OPENGL) - target_compile_definitions(mbgl-render-test PRIVATE "MLN_RENDER_BACKEND_OPENGL=1") -endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1fa8fffcb..2b21d7f23 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -148,10 +148,6 @@ if(MLN_WITH_OPENGL) ${PROJECT_SOURCE_DIR}/test/renderer/backend_scope.test.cpp ${PROJECT_SOURCE_DIR}/test/util/offscreen_texture.test.cpp ) - target_compile_definitions( - mbgl-test - PRIVATE MLN_RENDER_BACKEND_OPENGL=1 - ) endif() @@ -164,17 +160,6 @@ if(MLN_WITH_VULKAN) ${PROJECT_SOURCE_DIR}/test/renderer/backend_scope.test.cpp ${PROJECT_SOURCE_DIR}/test/util/offscreen_texture.test.cpp ) - target_compile_definitions( - mbgl-test - PRIVATE MLN_RENDER_BACKEND_VULKAN=1 - ) -endif() - -if(MLN_WITH_METAL) - target_compile_definitions( - mbgl-test - PRIVATE MLN_RENDER_BACKEND_METAL=1 - ) endif() if(CMAKE_SYSTEM_NAME STREQUAL Android)