Merge pull request #757 from bilke/projectdata-fix

Pass definition of OGS_BUILD_GUI to ApplicationLib

Applications/CLI/CMakeLists.txt

@@ -15,6 +15,10 @@ target_link_libraries(ogs
 
 )
 
+if(OGS_BUILD_GUI)
+	target_link_libraries(ogs QtDataView VtkVis vtkInteractionStyle)
+endif()
+
 ADD_CATALYST_DEPENDENCY(ogs)
 
 if(OGS_USE_PETSC)

Applications/CMakeLists.txt

+if(OGS_BUILD_GUI)
+	add_definitions(-DOGS_BUILD_GUI)
+endif()
+
 add_subdirectory(ApplicationsLib)
 
 if(OGS_BUILD_UTILS AND NOT IS_SUBPROJECT)
@@ -5,7 +9,6 @@ if(OGS_BUILD_UTILS AND NOT IS_SUBPROJECT)
 endif() # OGS_BUILD_UTILS AND NOT IS_SUBPROJECT
 
 if(OGS_BUILD_GUI)
-	add_definitions(-DOGS_BUILD_GUI)
 	add_subdirectory(DataExplorer)
 endif() # OGS_BUILD_GUI
 

Tests/CMakeLists.txt

@@ -75,6 +75,7 @@ if(OGS_BUILD_GUI)
 	target_link_libraries(testrunner
 		QtDataView
 		VtkVis
+		vtkInteractionStyle
 	)
 endif()
 

Tests/FileIO/TestXmlGmlReader.cpp

@@ -31,7 +31,6 @@ TEST(FileIO, XmlGmlWriterReaderTest)
 	// Writer test
 	std::string test_data_file(BaseLib::BuildInfo::source_path + "/Tests/FileIO/xmlgmltestdata.gml");
 
-	ProjectData project;
 	GeoLib::GEOObjects geo_objects;
 
 	//setup test data