summaryrefslogtreecommitdiff
path: root/platform/qt/config.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'platform/qt/config.cmake')
-rw-r--r--platform/qt/config.cmake43
1 files changed, 23 insertions, 20 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake
index d93c6fe197..76d0c2ad52 100644
--- a/platform/qt/config.cmake
+++ b/platform/qt/config.cmake
@@ -1,7 +1,5 @@
include(platform/qt/qt.cmake)
-mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX})
-
if(NOT WITH_QT_DECODERS)
mason_use(libjpeg-turbo VERSION 1.5.0)
mason_use(libpng VERSION 1.6.25)
@@ -63,28 +61,33 @@ macro(mbgl_filesource)
)
endmacro()
+# FIXME: For now tests are disabled on Windows until we
+# get the node.js dependencies working.
+if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+ mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX})
-macro(mbgl_platform_test)
- target_sources(mbgl-test
- PRIVATE platform/qt/test/main.cpp
- PRIVATE platform/qt/test/qmapboxgl.test.cpp
- PRIVATE platform/qt/test/qmapboxgl.test.cpp
- )
+ macro(mbgl_platform_test)
+ target_sources(mbgl-test
+ PRIVATE platform/qt/test/main.cpp
+ PRIVATE platform/qt/test/qmapboxgl.test.cpp
+ PRIVATE platform/qt/test/qmapboxgl.test.cpp
+ )
- target_include_directories(mbgl-test
- PRIVATE platform/qt
- )
+ target_include_directories(mbgl-test
+ PRIVATE platform/qt
+ )
- set_source_files_properties(
- platform/qt/test/main.cpp
- PROPERTIES COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}"
- )
+ set_source_files_properties(
+ platform/qt/test/main.cpp
+ PROPERTIES COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}"
+ )
- target_link_libraries(mbgl-test
- PRIVATE qmapboxgl
- PRIVATE mbgl-filesource
- )
-endmacro()
+ target_link_libraries(mbgl-test
+ PRIVATE qmapboxgl
+ PRIVATE mbgl-filesource
+ )
+ endmacro()
+endif()
target_add_mason_package(qmapboxgl PRIVATE geojson)
target_add_mason_package(qmapboxgl PRIVATE rapidjson)