Merge branch 'master' into Mesh2MeshPropertyInterpolation

.gitignore

 *.bak*
-*.orig
\ No newline at end of file
+*.orig
+build*/
+*.sw[op]
+tags

Tests/CMakeLists.txt

 ADD_SUBDIRECTORY( gtest )
 
-GET_SOURCE_FILES(TEST_SOURCES)
-GET_SOURCE_FILES(TEST_SOURCES BaseLib)
-GET_SOURCE_FILES(TEST_SOURCES GeoLib)
+APPEND_SOURCE_FILES(TEST_SOURCES)
+APPEND_SOURCE_FILES(TEST_SOURCES BaseLib)
+APPEND_SOURCE_FILES(TEST_SOURCES GeoLib)
 
 INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}/Tests/gtest
@@ -19,5 +19,15 @@ TARGET_LINK_LIBRARIES(testrunner
 	GeoLib
 )
 
+# Add make-target test which runs the testrunner
+# This should override CTest's predefined test-target but it does not
+ADD_CUSTOM_TARGET(test
+	${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/testrunner
+	DEPENDS testrunner
+)
+
+# Testing
+#ENABLE_TESTING()
+
 # Creates one ctest entry for every googletest
-ADD_GOOGLE_TESTS ( ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/testrunner ${TEST_SOURCES})
+#ADD_GOOGLE_TESTS ( ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/testrunner ${TEST_SOURCES})

scripts/cmake/Coverage.cmake

@@ -10,8 +10,8 @@ SET(COVERAGE_EXCLUDES
 )
 
 IF(JENKINS_URL)
-	SETUP_TARGET_FOR_COVERAGE_COBERTURA(ctest_coverage ctest "ctest_coverage_results" "-j;${PROCESSOR_COUNT}")
+	SETUP_TARGET_FOR_COVERAGE_COBERTURA(testrunner_coverage testrunner "testrunner_coverage_results" "-j;${PROCESSOR_COUNT}")
 ELSE()
-	SETUP_TARGET_FOR_COVERAGE(ctest_coverage ctest "ctest_coverage_results" "-j;${PROCESSOR_COUNT}")
+	SETUP_TARGET_FOR_COVERAGE(testrunner_coverage testrunner "testrunner_coverage_results" "-j;${PROCESSOR_COUNT}")
 	SETUP_TARGET_FOR_COVERAGE(ogs-gui_coverage ${EXECUTABLE_OUTPUT_PATH}/ogs-gui "ogs-gui_coverage_results")
-ENDIF()
\ No newline at end of file
+ENDIF()

scripts/cmake/DocumentationSetup.cmake

@@ -12,6 +12,11 @@ IF(DOXYGEN_EXECUTABLE)
 		MESSAGE(WARNING "The DOT tool was not found but is needed for generating doxygen diagrams!")
 	ENDIF() # DOT_TOOL_PATH AND (DOCS_GENERATE_DIAGRAMS OR ...)
 
+	SET(DOT_FOUND 0)
+	IF(DOT_TOOL_PATH)
+	    SET(DOT_FOUND 1)
+	ENDIF() # DOT_TOOL_PATH
+
 	IF(DOCS_GENERATE_CALL_GRAPHS)
 		SET(DOCS_GENERATE_CALL_GRAPHS_STRING "YES" CACHE INTERNAL "")
 	ENDIF() # DOCS_GENERATE_CALL_GRAPHS
@@ -38,4 +43,4 @@ IF(DOXYGEN_EXECUTABLE)
 	ENDIF() # DOCS_GENERATE_DOCSET
 
 
-ENDIF() # DOXYGEN_EXECUTABLE
\ No newline at end of file
+ENDIF() # DOXYGEN_EXECUTABLE

scripts/cmake/Functions.cmake

@@ -35,6 +35,13 @@ MACRO(GET_SOURCE_FILES SOURCE_FILES)
 
 ENDMACRO()
 
+# Appends a list of source files (*.h and *.cpp) to SOURCE_FILES and creates a Visual
+# Studio folder. A (relative) subdirectory can be passed as second parameter (optional).
+MACRO(APPEND_SOURCE_FILES SOURCE_FILES)
+	GET_SOURCE_FILES(TMP_SOURCES "${ARGV}")
+	SET(${SOURCE_FILES} ${${SOURCE_FILES}} ${TMP_SOURCES})
+ENDMACRO()
+
 # Creates one ctest for each googletest found in source files passed as arguments
 # number two onwards. Argument one specifies the testrunner executable.
 MACRO(ADD_GOOGLE_TESTS executable)

scripts/cmake/ProjectSetup.cmake

@@ -23,7 +23,4 @@ INCLUDE_DIRECTORIES (
 
 
 # Enable Visual Studio project folder grouping
-SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
-
-# Testing
-ENABLE_TESTING()
\ No newline at end of file
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
\ No newline at end of file

scripts/docs/Doxyfile.in

@@ -380,7 +380,7 @@ EXTRACT_PRIVATE        = YES
 # If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
 # scope will be included in the documentation.
 
-EXTRACT_PACKAGE        = NO
+EXTRACT_PACKAGE        = YES
 
 # If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
@@ -406,7 +406,7 @@ EXTRACT_LOCAL_METHODS  = NO
 # name of the file that contains the anonymous namespace. By default
 # anonymous namespaces are hidden.
 
-EXTRACT_ANON_NSPACES   = NO
+EXTRACT_ANON_NSPACES   = YES
 
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
 # undocumented members of documented classes, files or namespaces.
@@ -414,14 +414,14 @@ EXTRACT_ANON_NSPACES   = NO
 # various overviews, but no documentation section is generated.
 # This option has no effect if EXTRACT_ALL is enabled.
 
-HIDE_UNDOC_MEMBERS     = YES
+HIDE_UNDOC_MEMBERS     = NO
 
 # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy.
 # If set to NO (the default) these classes will be included in the various
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
-HIDE_UNDOC_CLASSES     = YES
+HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
 # friend (class|struct|union) declarations.
@@ -442,7 +442,7 @@ HIDE_IN_BODY_DOCS      = NO
 # to NO (the default) then the documentation will be excluded.
 # Set it to YES to include the internal documentation.
 
-INTERNAL_DOCS          = NO
+INTERNAL_DOCS          = YES
 
 # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
 # file names in lower-case letters. If set to YES upper-case letters are also
@@ -450,7 +450,7 @@ INTERNAL_DOCS          = NO
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
 
-CASE_SENSE_NAMES       = NO
+CASE_SENSE_NAMES       = YES
 
 # If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
 # will show members with their full class and namespace scopes in the
@@ -810,12 +810,12 @@ FILTER_SOURCE_PATTERNS =
 # Note: To get rid of all source code in the generated output, make sure also
 # VERBATIM_HEADERS is set to NO.
 
-SOURCE_BROWSER         = NO
+SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
 
-INLINE_SOURCES         = NO
+INLINE_SOURCES         = YES
 
 # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
 # doxygen to hide any special comment blocks from generated source code
@@ -827,13 +827,13 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES
 # then for each documented function all documented entities
 # called/used by that function will be listed.
 
-REFERENCES_RELATION    = NO
+REFERENCES_RELATION    = YES
 
 # If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
 # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
@@ -865,13 +865,13 @@ VERBATIM_HEADERS       = YES
 # of all compounds will be generated. Enable this if the project
 # contains a lot of classes, structs, unions or interfaces.
 
-ALPHABETICAL_INDEX     = NO
+ALPHABETICAL_INDEX     = YES
 
 # If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
-COLS_IN_ALPHA_INDEX    = 5
+COLS_IN_ALPHA_INDEX    = 2
 
 # In case all classes in a project start with a common prefix, all
 # classes will be put under the same header in the alphabetical index.
@@ -1704,7 +1704,7 @@ UML_LIMIT_NUM_FIELDS   = 10
 # If set to YES, the inheritance and collaboration graphs will show the
 # relations between templates and their instances.
 
-TEMPLATE_RELATIONS     = NO
+TEMPLATE_RELATIONS     = YES
 
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
 # tags are set to YES then doxygen will generate a graph for each documented
@@ -1734,7 +1734,7 @@ CALL_GRAPH             = ${DOCS_GENERATE_CALL_GRAPHS_STRING}
 # the time of a run. So in most cases it will be better to enable caller
 # graphs for selected functions only using the \callergraph command.
 
-CALLER_GRAPH           = NO
+CALLER_GRAPH           = YES
 
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
 # will generate a graphical hierarchy of all classes instead of a textual one.