diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-08-05 23:45:57 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-07-07 18:10:06 +0300 |
| commit | 35b90618b77391eb9cddcfa6286e679c63b14a09 (patch) | |
| tree | 8afc3fdee0de9477ad65eb6635da846366f19226 | |
| parent | 65118296eb4b17f3abdf5613d2f5d07fb83df74c (diff) | |
| download | qtlocation-mapboxgl-35b90618b77391eb9cddcfa6286e679c63b14a09.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 5b09dbf9ab..5133d517d4 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -96,13 +96,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( |