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

CMakeLists.txt

@@ -30,7 +30,7 @@ ENDIF() # GCC AND GPROF_PATH
 ######################
 
 # Add subdirectories with the projects
-ADD_SUBDIRECTORY( Base )
+ADD_SUBDIRECTORY( BaseLib )
 ADD_SUBDIRECTORY( FileIO )
 ADD_SUBDIRECTORY( GeoLib )
 ADD_SUBDIRECTORY( MathLib )

FileIO/CMakeLists.txt

@@ -7,7 +7,7 @@ ADD_LIBRARY(FileIO STATIC ${SOURCES})
 
 include_directories(
 	.
-	../Base
+	../BaseLib
 	../GeoLib
 	../MathLib
 	../MeshLib

GeoLib/CMakeLists.txt

@@ -7,13 +7,13 @@ ADD_LIBRARY(GeoLib STATIC ${SOURCES_GEOLIB})
 
 include_directories(
 	.
-	../Base
+	../BaseLib
 	../MathLib
 )
 
 
 target_link_libraries (GeoLib
-	Base
+	BaseLib
 	MathLib
 )
 

MathLib/CMakeLists.txt

@@ -25,7 +25,7 @@ ENDIF ()
 
 INCLUDE_DIRECTORIES (
 	.
-	../Base
+	../BaseLib
 	../GeoLib
 )
 

MeshLib/CMakeLists.txt

@@ -10,14 +10,14 @@ ADD_LIBRARY(MeshLib STATIC ${SOURCES})
 
 include_directories(
 	.
-	../Base
+	../BaseLib
 	../GeoLib
 	../MathLib
 )
 
 
 target_link_libraries (MeshLib
-	Base
+	BaseLib
 	GeoLib
 	MathLib
 )

MeshLib/Elements/Element.cpp

@@ -14,7 +14,6 @@ namespace MeshLib {
 
 /*
 Element::Element(Node** nodes, MshElemType::type type, unsigned value)
-	: _nodes(nodes), _type(type), _value(value)
 {
 }
 */

SimpleTests/MatrixTests/CMakeLists.txt

@@ -11,8 +11,8 @@ ENDIF (CMAKE_USE_PTHREADS_INIT )
 
 INCLUDE_DIRECTORIES(
         .
-	${CMAKE_SOURCE_DIR}/Base/
-	${CMAKE_SOURCE_DIR}/Base/logog/include
+	${CMAKE_SOURCE_DIR}/BaseLib/
+	${CMAKE_SOURCE_DIR}/BaseLib/logog/include
 	${CMAKE_SOURCE_DIR}/MathLib/
 )
 
@@ -42,7 +42,7 @@ IF (METIS_FOUND)
 	SET_TARGET_PROPERTIES(MatVecMultPerm PROPERTIES FOLDER SimpleTests)
 
 	TARGET_LINK_LIBRARIES ( MatVecMultPerm
-		Base
+		BaseLib
 		MathLib
 		${METIS_LIBRARIES}
 		${ADDITIONAL_LIBS}
@@ -56,7 +56,7 @@ IF (METIS_FOUND)
 	SET_TARGET_PROPERTIES(MatVecMultNDPermOpenMP PROPERTIES FOLDER SimpleTests)
 
 	TARGET_LINK_LIBRARIES ( MatVecMultNDPermOpenMP
-		Base
+		BaseLib
 		MathLib
 		${METIS_LIBRARIES}
 		${ADDITIONAL_LIBS}
@@ -69,7 +69,7 @@ IF (WIN32)
 ENDIF (WIN32)
 
 TARGET_LINK_LIBRARIES ( MatMult
-	Base
+	BaseLib
 	MathLib
 )
 
@@ -78,7 +78,7 @@ IF (WIN32)
 ENDIF (WIN32)
 
 TARGET_LINK_LIBRARIES ( MatTestRemoveRowsCols
-	Base
+	BaseLib
 	MathLib
 )
 

SimpleTests/MeshTests/CMakeLists.txt

 
 INCLUDE_DIRECTORIES(
         .
-	${CMAKE_SOURCE_DIR}/Base/
-	${CMAKE_SOURCE_DIR}/Base/logog/include
+	${CMAKE_SOURCE_DIR}/BaseLib/
+	${CMAKE_SOURCE_DIR}/BaseLib/logog/include
 	${CMAKE_SOURCE_DIR}/FileIO/
 	${CMAKE_SOURCE_DIR}/MathLib/
 	${CMAKE_SOURCE_DIR}/MeshLib/
@@ -19,7 +19,7 @@ TARGET_LINK_LIBRARIES ( MeshRead
 	MeshLib
 	FileIO	
 	MathLib	
-	Base
+	BaseLib
 	GeoLib
 )
 

SimpleTests/SolverTests/CMakeLists.txt

@@ -14,7 +14,7 @@ ENDIF (CMAKE_USE_PTHREADS_INIT )
 
 INCLUDE_DIRECTORIES(
         .
-	../../Base/
+	../../BaseLib/
 	../../MathLib/
 )
 
@@ -55,7 +55,7 @@ TARGET_LINK_LIBRARIES ( ConjugateGradientUnpreconditioned
         ${BLAS_LIBRARIES}
         ${LAPACK_LIBRARIES}
 	MathLib
-	Base
+	BaseLib
 )
 
 IF (WIN32)
@@ -65,7 +65,7 @@ TARGET_LINK_LIBRARIES ( ConjugateGradientDiagPrecond
         ${BLAS_LIBRARIES}
         ${LAPACK_LIBRARIES}
 	MathLib
-	Base
+	BaseLib
 )
 
 IF (WIN32)
@@ -75,7 +75,7 @@ TARGET_LINK_LIBRARIES( BiCGStabDiagPrecond
         ${BLAS_LIBRARIES}
         ${LAPACK_LIBRARIES}
 	MathLib
-	Base
+	BaseLib
 )
 
 IF (WIN32)
@@ -85,6 +85,6 @@ TARGET_LINK_LIBRARIES( GMResDiagPrecond
         ${BLAS_LIBRARIES}
         ${LAPACK_LIBRARIES}
 	MathLib
-	Base
+	BaseLib
 )