diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-08-05 23:45:57 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2017-01-24 11:36:59 +0200 |
| commit | 7ade062a51195d3514bc9d6ac6ce74e3f1516d58 (patch) | |
| tree | d51ef769a09f4e3558cb967107a16134c53a7c67 | |
| parent | 0333b53ae3791e11a703012b7f352f6e1ec325d7 (diff) | |
| download | qtlocation-mapboxgl-7ade062a51195d3514bc9d6ac6ce74e3f1516d58.tar.gz | |
[Qt] Make qt.cmake Windows-friendly
- Do not build headless view.
- Add no-op thread implementation.
| -rw-r--r-- | platform/qt/qt.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 958300c6f9..64edcc42a1 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -90,13 +90,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( |