Added ThirdParty-directory and moved logog in there.

logog header files have to be included e.g. with logog/include/logog.hpp

BaseLib/CMakeLists.txt

@@ -12,13 +12,5 @@ INCLUDE_DIRECTORIES(
 	zlib
 )
 
-# Add logog subdirectory and group its targets in a Visual Studio folder
-ADD_SUBDIRECTORY(logog)
-IF(BUILD_TESTING)
-	SET_PROPERTY(TARGET Continuous PROPERTY FOLDER "logog")
-ENDIF()
-SET_PROPERTY(TARGET logog PROPERTY FOLDER "logog")
-SET_PROPERTY(TARGET test-logog PROPERTY FOLDER "logog")
-
 # zlib
 ADD_SUBDIRECTORY(zlib)
\ No newline at end of file

BaseLib/LogogSimpleFormatter.h

@@ -14,7 +14,7 @@
 #define LOGOGSIMPLEFORMATTER_H
 
 // ** INCLUDES **
-#include "logog.hpp"
+#include "logog/include/logog.hpp"
 
 namespace BaseLib {
 /**

BaseLib/README.md

 # OpenGeoSys 6 #
 
-## Intro Base ##
-
-### Logging with logog ###
-
-For details how to use logog see the [OGS devguide](http://ufz.github.com/devguide/logging/) and the [logog documentation](http://johnwbyrd.github.com/logog/).
-
-[logog](http://johnwbyrd.github.com/logog/) is integrated as a [git-subtree](https://github.com/apenwarr/git-subtree) and can be updated with (executed in the sources root):
-
-	git-subtree pull -P BaseLib/logog --squash https://github.com/johnwbyrd/logog.git
-
-It was initially integrated with:
-
-	git-subtree add -P BaseLib/logog --squash https://github.com/johnwbyrd/logog.git master
+## Intro Base ##
\ No newline at end of file

CMakeLists.txt

@@ -87,6 +87,8 @@ ENDIF() #OGS_PACKAGING
 ######################
 
 # Add subdirectories with the projects
+ADD_SUBDIRECTORY( ThirdParty )
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/ThirdParty )
 ADD_SUBDIRECTORY( BaseLib )
 ADD_SUBDIRECTORY( FemLib )
 ADD_SUBDIRECTORY( FileIO )

FileIO/MeshIO/TetGenInterface.cpp

@@ -15,8 +15,8 @@
 // BaseLib
 #include "StringTools.h"
 
-// BaseLib/logog
-#include "logog.hpp"
+// ThirdParty/logog
+#include "logog/include/logog.hpp"
 
 // FileIO
 #include "TetGenInterface.h"

Gui/main.cpp

@@ -4,7 +4,7 @@
 #ifdef OGS_USE_OPENSG
 #include <OpenSG/OSGBaseFunctions.h>
 #endif
-#include "logog.hpp"
+#include "logog/include/logog.hpp"
 #include "LogogSimpleFormatter.h"
 
 int main(int argc, char* argv[])

MeshLib/CMakeLists.txt

@@ -12,7 +12,6 @@ include_directories(
 	../BaseLib
 	../GeoLib
 	../MathLib
-	${CMAKE_SOURCE_DIR}/BaseLib/logog/include
 )
 
 

MeshLib/Mesh.cpp

@@ -20,7 +20,7 @@
 #include "Elements/Pyramid.h"
 #include "Elements/Prism.h"
 
-#include "logog.hpp"
+#include "logog/include/logog.hpp"
 
 #include "RunTime.h"
 #include "uniqueInsert.h"

MeshLib/Mesh2MeshPropertyInterpolation.cpp

@@ -15,7 +15,7 @@
 #include "Mesh2MeshPropertyInterpolation.h"
 
 // BaseLib
-#include "logog.hpp"
+#include "logog/include/logog.hpp"
 
 // GeoLib
 #include "AABB.h"

MeshLib/MeshCoarsener.cpp

@@ -9,8 +9,8 @@
  *  Created on  Aug 3, 2012 by Thomas Fischer
  */
 
-// BaseLib/logog
-#include "logog.hpp"
+// ThirdParty/logog
+#include "logog/include/logog.hpp"
 
 #include "MeshCoarsener.h"
 

MeshLib/MeshQuality/MeshQualityChecker.h

@@ -21,7 +21,7 @@
 #include "Mesh.h"
 #include "Elements/Element.h"
 
-#include "logog.hpp"
+#include "logog/include/logog.hpp"
 
 namespace MeshLib
 {

MeshLib/MshEditor.cpp

@@ -21,7 +21,7 @@
 
 #include "MathTools.h"
 
-#include "logog.hpp"
+#include "logog/include/logog.hpp"
 
 namespace MeshLib {
 

SimpleTests/MatrixTests/CMakeLists.txt

@@ -11,7 +11,6 @@ INCLUDE_DIRECTORIES(
         .
 	${CMAKE_SOURCE_DIR}/BaseLib/
 	${CMAKE_BINARY_DIR}/BaseLib/
-	${CMAKE_SOURCE_DIR}/BaseLib/logog/include
 	${CMAKE_SOURCE_DIR}/MathLib/
 )
 

SimpleTests/MatrixTests/MatMult.cpp

@@ -22,9 +22,9 @@
 // BaseLib
 #include "RunTime.h"
 #include "CPUTime.h"
-// BaseLib/logog
-#include "logog.hpp"
-#include "formatter.hpp"
+// ThirdParty/logog
+#include "logog/include/logog.hpp"
+#include "logog/include/formatter.hpp"
 // BaseLib/tclap
 #include "tclap/CmdLine.h"
 

SimpleTests/MatrixTests/MatVecMultNDPerm.cpp

@@ -24,9 +24,9 @@
 #include "CPUTime.h"
 // BaseLib/tclap
 #include "tclap/CmdLine.h"
-// BaseLib/logog
-#include "logog.hpp"
-#include "formatter.hpp"
+// ThirdParty/logog
+#include "logog/include/logog.hpp"
+#include "logog/include/formatter.hpp"
 
 // MathLib
 #include "sparse.h"

SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp

@@ -16,9 +16,9 @@
 #include "CPUTime.h"
 // BaseLib/tclap
 #include "tclap/CmdLine.h"
-// BaseLib/logog
-#include "logog.hpp"
-#include "formatter.hpp"
+// ThirdParty/logog
+#include "logog/include/logog.hpp"
+#include "logog/include/formatter.hpp"
 
 // MathLib
 #include "sparse.h"

SimpleTests/MatrixTests/MatVecMultPthreads.cpp

@@ -22,9 +22,9 @@
 // BaseLib
 #include "RunTime.h"
 #include "CPUTime.h"
-// BaseLib/logog
-#include "logog.hpp"
-#include "formatter.hpp"
+// ThirdParty/logog
+#include "logog/include/logog.hpp"
+#include "logog/include/formatter.hpp"
 // BaseLib/tclap
 #include "tclap/CmdLine.h"
 

SimpleTests/MeshTests/CMakeLists.txt

@@ -3,9 +3,8 @@ IF (WIN32)
 ENDIF()
 
 INCLUDE_DIRECTORIES(
-        .
+	.
 	${CMAKE_SOURCE_DIR}/BaseLib/
-	${CMAKE_SOURCE_DIR}/BaseLib/logog/include
 	${CMAKE_SOURCE_DIR}/FileIO/
 	${CMAKE_SOURCE_DIR}/GeoLib/
 	${CMAKE_SOURCE_DIR}/MathLib/

SimpleTests/MeshTests/CollapseMeshNodes.cpp

@@ -15,8 +15,8 @@
 #include "tclap/CmdLine.h"
 #include "LogogSimpleFormatter.h"
 
-// BaseLib/logog
-#include "logog.hpp"
+// ThirdParty/logog
+#include "logog/include/logog.hpp"
 
 // MeshLib
 #include "Node.h"

SimpleTests/MeshTests/MeshRead.cpp

@@ -12,8 +12,8 @@
 #include "tclap/CmdLine.h"
 #include "LogogSimpleFormatter.h"
 
-// BaseLib/logog
-#include "logog.hpp"
+// ThirdParty/logog
+#include "logog/include/logog.hpp"
 
 // FileIO
 #include "readMeshFromFile.h"