Merge branch 'master' of github.com:ufz/ogs

SimpleTests/MatrixTests/CMakeLists.txt

@@ -21,6 +21,7 @@ ADD_EXECUTABLE( MatMult
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(MatMult PROPERTIES FOLDER SimpleTests)
 
 # Create the executable
 ADD_EXECUTABLE( MatTestRemoveRowsCols
@@ -28,6 +29,7 @@ ADD_EXECUTABLE( MatTestRemoveRowsCols
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(MatTestRemoveRowsCols PROPERTIES FOLDER SimpleTests)
 
 IF (METIS_FOUND)
 	ADD_EXECUTABLE( MatVecMultPerm
@@ -35,6 +37,7 @@ IF (METIS_FOUND)
 	        ${SOURCES}
         	${HEADERS}
 	)
+	SET_TARGET_PROPERTIES(MatVecMultPerm PROPERTIES FOLDER SimpleTests)
 
 	TARGET_LINK_LIBRARIES ( MatVecMultPerm
 		Base
@@ -48,6 +51,7 @@ IF (METIS_FOUND)
 	        ${SOURCES}
         	${HEADERS}
 	)
+	SET_TARGET_PROPERTIES(MatVecMultNDPermOpenMP PROPERTIES FOLDER SimpleTests)
 
 	TARGET_LINK_LIBRARIES ( MatVecMultNDPermOpenMP
 		Base

SimpleTests/SolverTests/CMakeLists.txt

@@ -24,24 +24,28 @@ ADD_EXECUTABLE( ConjugateGradientUnpreconditioned
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(ConjugateGradientUnpreconditioned PROPERTIES FOLDER SimpleTests)
 
 ADD_EXECUTABLE( ConjugateGradientDiagPrecond
         ConjugateGradientDiagonalPreconditioned.cpp
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(ConjugateGradientDiagPrecond PROPERTIES FOLDER SimpleTests)
 
 ADD_EXECUTABLE( BiCGStabDiagPrecond
 	BiCGStabDiagPrecond.cpp
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(BiCGStabDiagPrecond PROPERTIES FOLDER SimpleTests)
 
 ADD_EXECUTABLE( GMResDiagPrecond
 	GMResDiagPrecond.cpp
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(GMResDiagPrecond PROPERTIES FOLDER SimpleTests)
 
 
 IF (WIN32)

scripts/docs/Doxyfile.in

@@ -575,7 +575,8 @@ WARN_LOGFILE           =
 
 INPUT                  = ${CMAKE_SOURCE_DIR}/Base \
                          ${CMAKE_SOURCE_DIR}/GeoLib \
-                         ${CMAKE_SOURCE_DIR}/MathLib
+                         ${CMAKE_SOURCE_DIR}/MathLib \
+                         ${CMAKE_SOURCE_DIR}/MeshLib
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is