Merge pull request #985 from bilke/mxe-fix

Fixes for Windows cross-compilation

Applications/DataExplorer/VtkVis/CMakeLists.txt

@@ -131,7 +131,7 @@ if(GEOTIFF_FOUND)
 	target_link_libraries(VtkVis INTERFACE ${GEOTIFF_LIBRARIES})
 endif() # GEOTIFF_FOUND
 
-target_link_libraries(VtkVis PUBLIC Qt4::QtGui)
+target_link_libraries(VtkVis PUBLIC Qt4::QtGui QtDataView)
 target_link_libraries(VtkVis INTERFACE VtkAct)
 
 if(VTKOSGCONVERTER_FOUND)

Applications/Utils/SimpleMeshCreation/createMeshElemPropertiesFromASCRaster.cpp

@@ -10,6 +10,7 @@
  */
 
 #include <algorithm>
+#include <memory>
 #include <numeric>
 
 #include <tclap/CmdLine.h>

FileIO/CMakeLists.txt

@@ -61,6 +61,12 @@ target_link_libraries(FileIO INTERFACE
 )
 if(QT4_FOUND)
 	target_link_libraries(FileIO PUBLIC Qt4::QtXml Qt4::QtXmlPatterns)
+	if(WIN32 AND CMAKE_CROSSCOMPILING)
+		find_package(OpenSSL)
+		if(OPENSSL_FOUND)
+			target_link_libraries(FileIO PUBLIC Qt4::QtNetwork ${OPENSSL_LIBRARIES} ws2_32)
+		endif()
+	endif()
 endif()
 
 ADD_VTK_DEPENDENCY(FileIO)

SimpleTests/MatrixTests/CMakeLists.txt

-## pthread ##
-if(WIN32)
-	set(ADDITIONAL_LIBS Winmm.lib)
-endif()
-
 if(CMAKE_USE_PTHREADS_INIT)
 	set(HAVE_PTHREADS TRUE)
 endif()
@@ -36,7 +31,6 @@ target_link_libraries(MatMult
 	logog
 	BaseLib
 	MathLib
-	${ADDITIONAL_LIBS}
 )
 
 add_executable(MatTestRemoveRowsCols
@@ -48,7 +42,6 @@ set_target_properties(MatTestRemoveRowsCols PROPERTIES FOLDER SimpleTests)
 target_link_libraries(MatTestRemoveRowsCols
 	BaseLib
 	MathLib
-	${ADDITIONAL_LIBS}
 )
 
 if(METIS_FOUND)
@@ -64,7 +57,6 @@ if(METIS_FOUND)
 		MathLib
 		logog
 		${METIS_LIBRARIES}
-		${ADDITIONAL_LIBS}
 	)
 
 	if(OPENMP_FOUND)
@@ -80,7 +72,6 @@ if(METIS_FOUND)
 			MathLib
 			logog
 			${METIS_LIBRARIES}
-			${ADDITIONAL_LIBS}
 		)
 	endif()
 endif()

SimpleTests/MeshTests/CMakeLists.txt

-if(WIN32)
-	set(ADDITIONAL_LIBS Winmm.lib)
-endif()
-
 # Create the executable
 add_executable(MeshRead
 	MeshRead.cpp
@@ -16,7 +12,6 @@ target_link_libraries(MeshRead
 	BaseLib
 	GeoLib
 	logog
-	${ADDITIONAL_LIBS}
 	${BOOST_LIBRARIES}
 )
 
@@ -34,6 +29,5 @@ target_link_libraries(MeshSearchTest
 	BaseLib
 	GeoLib
 	logog
-	${ADDITIONAL_LIBS}
 	${BOOST_LIBRARIES}
 )

SimpleTests/SolverTests/CMakeLists.txt

-if(WIN32)
-	set(ADDITIONAL_LIBS Winmm.lib)
-endif()
-
 add_executable(ConjugateGradientUnpreconditioned
 	ConjugateGradientUnpreconditioned.cpp
 	${SOURCES}