fix travis build for mdal

qgis · Dec 17, 2018 · 39d168c · 39d168c
1 parent 8b542c8
commit 39d168c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/providers/mdal/CMakeLists.txt b/src/providers/mdal/CMakeLists.txt
@@ -34,7 +34,6 @@ IF (WITH_INTERNAL_MDAL)
   SET(MDAL_LIB_SRCS
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal.cpp
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_utils.cpp
-    ${CMAKE_SOURCE_DIR}/external/mdal/mdal_loader.cpp
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_data_model.cpp
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_memory_data_model.cpp
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_driver_manager.cpp
@@ -47,7 +46,6 @@ IF (WITH_INTERNAL_MDAL)
   SET(MDAL_LIB_HDRS
     ${CMAKE_SOURCE_DIR}/external/mdal/api/mdal.h
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_utils.hpp
-    ${CMAKE_SOURCE_DIR}/external/mdal/mdal_loader.hpp
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_data_model.hpp
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_memory_data_model.hpp
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_driver_manager.hpp

diff --git a/tests/src/providers/testqgsmdalprovider.cpp b/tests/src/providers/testqgsmdalprovider.cpp
@@ -77,10 +77,10 @@ void TestQgsMdalProvider::cleanupTestCase()
 void TestQgsMdalProvider::filters()
 {
   QString meshFilters = QgsProviderRegistry::instance()->fileMeshFilters();
-  QVERIFY(meshFilters.contains("*.2dm"));
+  QVERIFY( meshFilters.contains( "*.2dm" ) );
 
   QString datasetFilters = QgsProviderRegistry::instance()->fileMeshDatasetFilters();
-  QVERIFY(datasetFilters.contains("*.dat"));
+  QVERIFY( datasetFilters.contains( "*.dat" ) );
 }
 
 QGSTEST_MAIN( TestQgsMdalProvider )