diff options
Diffstat (limited to 'platform/qt/qt.cmake')
| -rw-r--r-- | platform/qt/qt.cmake | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 67622efca6..489ae5ed08 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -36,6 +36,9 @@ set(MBGL_QT_FILES PRIVATE platform/default/mbgl/util/default_thread_pool.cpp PRIVATE platform/default/mbgl/util/default_thread_pool.hpp + # Thread + PRIVATE platform/qt/src/thread_local.cpp + # Platform integration PRIVATE platform/qt/src/async_task.cpp PRIVATE platform/qt/src/async_task_impl.hpp @@ -43,7 +46,7 @@ set(MBGL_QT_FILES PRIVATE platform/qt/src/http_file_source.hpp PRIVATE platform/qt/src/http_request.cpp PRIVATE platform/qt/src/http_request.hpp - PRIVATE platform/qt/src/image.cpp + PRIVATE platform/qt/src/qt_image.cpp PRIVATE platform/qt/src/run_loop.cpp PRIVATE platform/qt/src/run_loop_impl.hpp PRIVATE platform/qt/src/sqlite3.cpp @@ -64,6 +67,8 @@ add_library(qmapboxgl SHARED platform/qt/src/qmapbox.cpp platform/qt/src/qmapboxgl.cpp platform/qt/src/qmapboxgl_p.hpp + platform/qt/src/qmapboxgl_renderer_frontend_p.hpp + platform/qt/src/qmapboxgl_renderer_frontend_p.cpp platform/default/mbgl/util/default_styles.hpp ) @@ -75,6 +80,8 @@ add_executable(mbgl-qt platform/qt/resources/common.qrc ) +xcode_create_scheme(TARGET mbgl-qt) + if(WITH_QT_4) include(platform/qt/qt4.cmake) else() @@ -90,13 +97,17 @@ if (MASON_PLATFORM STREQUAL "osx" OR MASON_PLATFORM STREQUAL "ios") PRIVATE "-framework Foundation" PRIVATE "-framework OpenGL" ) -else() +elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") list(APPEND MBGL_QT_FILES PRIVATE platform/default/thread.cpp ) list(APPEND MBGL_QT_LIBRARIES PRIVATE -lGL ) +elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + list(APPEND MBGL_QT_FILES + PRIVATE platform/qt/src/thread.cpp + ) endif() add_custom_command( @@ -106,3 +117,5 @@ add_custom_command( ${CMAKE_SOURCE_DIR}/platform/qt/include ${CMAKE_CURRENT_BINARY_DIR}/platform/qt/include ) + +xcode_create_scheme(TARGET qmapboxgl) |