From 1a30caa172aea0c2a40315b5adfc8d2a30e71e18 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Thu, 10 May 2012 09:31:14 +0200
Subject: [PATCH] in order to make the name of libraries, namespaces and
 directories more consistent the Base directory is know named BaseLib

---
 {Base => BaseLib}/CMakeLists.txt               |  6 +++---
 {Base => BaseLib}/CPUTimeTimer.cpp             |  0
 {Base => BaseLib}/CPUTimeTimer.h               |  0
 {Base => BaseLib}/Configure.h.in               |  0
 {Base => BaseLib}/DateTools.cpp                |  0
 {Base => BaseLib}/DateTools.h                  |  0
 {Base => BaseLib}/FileFinder.h                 |  0
 {Base => BaseLib}/FileTools.h                  |  0
 {Base => BaseLib}/README.md                    |  0
 {Base => BaseLib}/RunTimeTimer.cpp             |  0
 {Base => BaseLib}/RunTimeTimer.h               |  0
 {Base => BaseLib}/StringTools.cpp              |  0
 {Base => BaseLib}/StringTools.h                |  0
 {Base => BaseLib}/TimeMeasurementBase.h        |  0
 {Base => BaseLib}/binarySearch.cpp             |  0
 {Base => BaseLib}/binarySearch.h               |  0
 {Base => BaseLib}/logog/CMakeLists.txt         |  0
 {Base => BaseLib}/logog/doc/make-doxygen.bat   |  0
 {Base => BaseLib}/logog/doc/overview.dox       |  0
 {Base => BaseLib}/logog/doxyfile               |  0
 {Base => BaseLib}/logog/include/api.hpp        |  0
 {Base => BaseLib}/logog/include/checkpoint.hpp |  0
 {Base => BaseLib}/logog/include/const.hpp      |  0
 {Base => BaseLib}/logog/include/formatter.hpp  |  0
 {Base => BaseLib}/logog/include/logog.hpp      |  0
 {Base => BaseLib}/logog/include/macro.hpp      |  0
 {Base => BaseLib}/logog/include/message.hpp    |  0
 {Base => BaseLib}/logog/include/mutex.hpp      |  0
 {Base => BaseLib}/logog/include/node.hpp       |  0
 {Base => BaseLib}/logog/include/object.hpp     |  0
 {Base => BaseLib}/logog/include/platform.hpp   |  0
 {Base => BaseLib}/logog/include/socket.hpp     |  0
 {Base => BaseLib}/logog/include/statics.hpp    |  0
 {Base => BaseLib}/logog/include/string.hpp     |  0
 {Base => BaseLib}/logog/include/target.hpp     |  0
 {Base => BaseLib}/logog/include/thread.hpp     |  0
 {Base => BaseLib}/logog/include/timer.hpp      |  0
 {Base => BaseLib}/logog/include/topic.hpp      |  0
 {Base => BaseLib}/logog/include/unittest.hpp   |  0
 {Base => BaseLib}/logog/readme.txt             |  0
 {Base => BaseLib}/logog/src/api.cpp            |  0
 {Base => BaseLib}/logog/src/checkpoint.cpp     |  0
 {Base => BaseLib}/logog/src/formatter.cpp      |  0
 {Base => BaseLib}/logog/src/lobject.cpp        |  0
 {Base => BaseLib}/logog/src/logog.vcproj       |  0
 {Base => BaseLib}/logog/src/lstring.cpp        |  0
 {Base => BaseLib}/logog/src/message.cpp        |  0
 {Base => BaseLib}/logog/src/mutex.cpp          |  0
 {Base => BaseLib}/logog/src/node.cpp           |  0
 {Base => BaseLib}/logog/src/platform.cpp       |  0
 {Base => BaseLib}/logog/src/socket.cpp         |  0
 {Base => BaseLib}/logog/src/statics.cpp        |  0
 {Base => BaseLib}/logog/src/target.cpp         |  0
 {Base => BaseLib}/logog/src/timer.cpp          |  0
 {Base => BaseLib}/logog/src/topic.cpp          |  0
 {Base => BaseLib}/logog/src/unittest.cpp       |  0
 {Base => BaseLib}/logog/test/CMakeLists.txt    |  0
 {Base => BaseLib}/logog/test/test.cpp          |  0
 {Base => BaseLib}/logog/test/test.sln          |  0
 {Base => BaseLib}/logog/test/test.vcproj       |  0
 {Base => BaseLib}/logog/test/test.vcproj.lnt   |  0
 {Base => BaseLib}/printList.h                  |  0
 {Base => BaseLib}/quicksort.h                  |  0
 {Base => BaseLib}/swap.h                       |  0
 {Base => BaseLib}/uniqueListInsert.h           |  0
 {Base => BaseLib}/wait.h                       |  0
 CMakeLists.txt                                 |  2 +-
 FileIO/CMakeLists.txt                          |  2 +-
 GeoLib/CMakeLists.txt                          |  4 ++--
 MathLib/CMakeLists.txt                         |  2 +-
 MeshLib/CMakeLists.txt                         |  4 ++--
 SimpleTests/MatrixTests/CMakeLists.txt         | 12 ++++++------
 SimpleTests/MeshTests/CMakeLists.txt           |  6 +++---
 SimpleTests/SolverTests/CMakeLists.txt         | 10 +++++-----
 74 files changed, 24 insertions(+), 24 deletions(-)
 rename {Base => BaseLib}/CMakeLists.txt (52%)
 rename {Base => BaseLib}/CPUTimeTimer.cpp (100%)
 rename {Base => BaseLib}/CPUTimeTimer.h (100%)
 rename {Base => BaseLib}/Configure.h.in (100%)
 rename {Base => BaseLib}/DateTools.cpp (100%)
 rename {Base => BaseLib}/DateTools.h (100%)
 rename {Base => BaseLib}/FileFinder.h (100%)
 rename {Base => BaseLib}/FileTools.h (100%)
 rename {Base => BaseLib}/README.md (100%)
 rename {Base => BaseLib}/RunTimeTimer.cpp (100%)
 rename {Base => BaseLib}/RunTimeTimer.h (100%)
 rename {Base => BaseLib}/StringTools.cpp (100%)
 rename {Base => BaseLib}/StringTools.h (100%)
 rename {Base => BaseLib}/TimeMeasurementBase.h (100%)
 rename {Base => BaseLib}/binarySearch.cpp (100%)
 rename {Base => BaseLib}/binarySearch.h (100%)
 rename {Base => BaseLib}/logog/CMakeLists.txt (100%)
 rename {Base => BaseLib}/logog/doc/make-doxygen.bat (100%)
 rename {Base => BaseLib}/logog/doc/overview.dox (100%)
 rename {Base => BaseLib}/logog/doxyfile (100%)
 rename {Base => BaseLib}/logog/include/api.hpp (100%)
 rename {Base => BaseLib}/logog/include/checkpoint.hpp (100%)
 rename {Base => BaseLib}/logog/include/const.hpp (100%)
 rename {Base => BaseLib}/logog/include/formatter.hpp (100%)
 rename {Base => BaseLib}/logog/include/logog.hpp (100%)
 rename {Base => BaseLib}/logog/include/macro.hpp (100%)
 rename {Base => BaseLib}/logog/include/message.hpp (100%)
 rename {Base => BaseLib}/logog/include/mutex.hpp (100%)
 rename {Base => BaseLib}/logog/include/node.hpp (100%)
 rename {Base => BaseLib}/logog/include/object.hpp (100%)
 rename {Base => BaseLib}/logog/include/platform.hpp (100%)
 rename {Base => BaseLib}/logog/include/socket.hpp (100%)
 rename {Base => BaseLib}/logog/include/statics.hpp (100%)
 rename {Base => BaseLib}/logog/include/string.hpp (100%)
 rename {Base => BaseLib}/logog/include/target.hpp (100%)
 rename {Base => BaseLib}/logog/include/thread.hpp (100%)
 rename {Base => BaseLib}/logog/include/timer.hpp (100%)
 rename {Base => BaseLib}/logog/include/topic.hpp (100%)
 rename {Base => BaseLib}/logog/include/unittest.hpp (100%)
 rename {Base => BaseLib}/logog/readme.txt (100%)
 rename {Base => BaseLib}/logog/src/api.cpp (100%)
 rename {Base => BaseLib}/logog/src/checkpoint.cpp (100%)
 rename {Base => BaseLib}/logog/src/formatter.cpp (100%)
 rename {Base => BaseLib}/logog/src/lobject.cpp (100%)
 rename {Base => BaseLib}/logog/src/logog.vcproj (100%)
 rename {Base => BaseLib}/logog/src/lstring.cpp (100%)
 rename {Base => BaseLib}/logog/src/message.cpp (100%)
 rename {Base => BaseLib}/logog/src/mutex.cpp (100%)
 rename {Base => BaseLib}/logog/src/node.cpp (100%)
 rename {Base => BaseLib}/logog/src/platform.cpp (100%)
 rename {Base => BaseLib}/logog/src/socket.cpp (100%)
 rename {Base => BaseLib}/logog/src/statics.cpp (100%)
 rename {Base => BaseLib}/logog/src/target.cpp (100%)
 rename {Base => BaseLib}/logog/src/timer.cpp (100%)
 rename {Base => BaseLib}/logog/src/topic.cpp (100%)
 rename {Base => BaseLib}/logog/src/unittest.cpp (100%)
 rename {Base => BaseLib}/logog/test/CMakeLists.txt (100%)
 rename {Base => BaseLib}/logog/test/test.cpp (100%)
 rename {Base => BaseLib}/logog/test/test.sln (100%)
 rename {Base => BaseLib}/logog/test/test.vcproj (100%)
 rename {Base => BaseLib}/logog/test/test.vcproj.lnt (100%)
 rename {Base => BaseLib}/printList.h (100%)
 rename {Base => BaseLib}/quicksort.h (100%)
 rename {Base => BaseLib}/swap.h (100%)
 rename {Base => BaseLib}/uniqueListInsert.h (100%)
 rename {Base => BaseLib}/wait.h (100%)

diff --git a/Base/CMakeLists.txt b/BaseLib/CMakeLists.txt
similarity index 52%
rename from Base/CMakeLists.txt
rename to BaseLib/CMakeLists.txt
index 6a3d803c0fa..53b61bfa0a9 100644
--- a/Base/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -3,9 +3,9 @@
 GET_SOURCE_FILES(SOURCES)
 
 # Create the library
-ADD_LIBRARY( Base STATIC ${SOURCES})
+ADD_LIBRARY( BaseLib STATIC ${SOURCES})
 
-SET_TARGET_PROPERTIES(Base PROPERTIES LINKER_LANGUAGE CXX)
+SET_TARGET_PROPERTIES(BaseLib PROPERTIES LINKER_LANGUAGE CXX)
 
 INCLUDE_DIRECTORIES(
         ../GeoLib
@@ -13,4 +13,4 @@ INCLUDE_DIRECTORIES(
         .
 )
 
-ADD_SUBDIRECTORY(logog)
\ No newline at end of file
+ADD_SUBDIRECTORY(logog)
diff --git a/Base/CPUTimeTimer.cpp b/BaseLib/CPUTimeTimer.cpp
similarity index 100%
rename from Base/CPUTimeTimer.cpp
rename to BaseLib/CPUTimeTimer.cpp
diff --git a/Base/CPUTimeTimer.h b/BaseLib/CPUTimeTimer.h
similarity index 100%
rename from Base/CPUTimeTimer.h
rename to BaseLib/CPUTimeTimer.h
diff --git a/Base/Configure.h.in b/BaseLib/Configure.h.in
similarity index 100%
rename from Base/Configure.h.in
rename to BaseLib/Configure.h.in
diff --git a/Base/DateTools.cpp b/BaseLib/DateTools.cpp
similarity index 100%
rename from Base/DateTools.cpp
rename to BaseLib/DateTools.cpp
diff --git a/Base/DateTools.h b/BaseLib/DateTools.h
similarity index 100%
rename from Base/DateTools.h
rename to BaseLib/DateTools.h
diff --git a/Base/FileFinder.h b/BaseLib/FileFinder.h
similarity index 100%
rename from Base/FileFinder.h
rename to BaseLib/FileFinder.h
diff --git a/Base/FileTools.h b/BaseLib/FileTools.h
similarity index 100%
rename from Base/FileTools.h
rename to BaseLib/FileTools.h
diff --git a/Base/README.md b/BaseLib/README.md
similarity index 100%
rename from Base/README.md
rename to BaseLib/README.md
diff --git a/Base/RunTimeTimer.cpp b/BaseLib/RunTimeTimer.cpp
similarity index 100%
rename from Base/RunTimeTimer.cpp
rename to BaseLib/RunTimeTimer.cpp
diff --git a/Base/RunTimeTimer.h b/BaseLib/RunTimeTimer.h
similarity index 100%
rename from Base/RunTimeTimer.h
rename to BaseLib/RunTimeTimer.h
diff --git a/Base/StringTools.cpp b/BaseLib/StringTools.cpp
similarity index 100%
rename from Base/StringTools.cpp
rename to BaseLib/StringTools.cpp
diff --git a/Base/StringTools.h b/BaseLib/StringTools.h
similarity index 100%
rename from Base/StringTools.h
rename to BaseLib/StringTools.h
diff --git a/Base/TimeMeasurementBase.h b/BaseLib/TimeMeasurementBase.h
similarity index 100%
rename from Base/TimeMeasurementBase.h
rename to BaseLib/TimeMeasurementBase.h
diff --git a/Base/binarySearch.cpp b/BaseLib/binarySearch.cpp
similarity index 100%
rename from Base/binarySearch.cpp
rename to BaseLib/binarySearch.cpp
diff --git a/Base/binarySearch.h b/BaseLib/binarySearch.h
similarity index 100%
rename from Base/binarySearch.h
rename to BaseLib/binarySearch.h
diff --git a/Base/logog/CMakeLists.txt b/BaseLib/logog/CMakeLists.txt
similarity index 100%
rename from Base/logog/CMakeLists.txt
rename to BaseLib/logog/CMakeLists.txt
diff --git a/Base/logog/doc/make-doxygen.bat b/BaseLib/logog/doc/make-doxygen.bat
similarity index 100%
rename from Base/logog/doc/make-doxygen.bat
rename to BaseLib/logog/doc/make-doxygen.bat
diff --git a/Base/logog/doc/overview.dox b/BaseLib/logog/doc/overview.dox
similarity index 100%
rename from Base/logog/doc/overview.dox
rename to BaseLib/logog/doc/overview.dox
diff --git a/Base/logog/doxyfile b/BaseLib/logog/doxyfile
similarity index 100%
rename from Base/logog/doxyfile
rename to BaseLib/logog/doxyfile
diff --git a/Base/logog/include/api.hpp b/BaseLib/logog/include/api.hpp
similarity index 100%
rename from Base/logog/include/api.hpp
rename to BaseLib/logog/include/api.hpp
diff --git a/Base/logog/include/checkpoint.hpp b/BaseLib/logog/include/checkpoint.hpp
similarity index 100%
rename from Base/logog/include/checkpoint.hpp
rename to BaseLib/logog/include/checkpoint.hpp
diff --git a/Base/logog/include/const.hpp b/BaseLib/logog/include/const.hpp
similarity index 100%
rename from Base/logog/include/const.hpp
rename to BaseLib/logog/include/const.hpp
diff --git a/Base/logog/include/formatter.hpp b/BaseLib/logog/include/formatter.hpp
similarity index 100%
rename from Base/logog/include/formatter.hpp
rename to BaseLib/logog/include/formatter.hpp
diff --git a/Base/logog/include/logog.hpp b/BaseLib/logog/include/logog.hpp
similarity index 100%
rename from Base/logog/include/logog.hpp
rename to BaseLib/logog/include/logog.hpp
diff --git a/Base/logog/include/macro.hpp b/BaseLib/logog/include/macro.hpp
similarity index 100%
rename from Base/logog/include/macro.hpp
rename to BaseLib/logog/include/macro.hpp
diff --git a/Base/logog/include/message.hpp b/BaseLib/logog/include/message.hpp
similarity index 100%
rename from Base/logog/include/message.hpp
rename to BaseLib/logog/include/message.hpp
diff --git a/Base/logog/include/mutex.hpp b/BaseLib/logog/include/mutex.hpp
similarity index 100%
rename from Base/logog/include/mutex.hpp
rename to BaseLib/logog/include/mutex.hpp
diff --git a/Base/logog/include/node.hpp b/BaseLib/logog/include/node.hpp
similarity index 100%
rename from Base/logog/include/node.hpp
rename to BaseLib/logog/include/node.hpp
diff --git a/Base/logog/include/object.hpp b/BaseLib/logog/include/object.hpp
similarity index 100%
rename from Base/logog/include/object.hpp
rename to BaseLib/logog/include/object.hpp
diff --git a/Base/logog/include/platform.hpp b/BaseLib/logog/include/platform.hpp
similarity index 100%
rename from Base/logog/include/platform.hpp
rename to BaseLib/logog/include/platform.hpp
diff --git a/Base/logog/include/socket.hpp b/BaseLib/logog/include/socket.hpp
similarity index 100%
rename from Base/logog/include/socket.hpp
rename to BaseLib/logog/include/socket.hpp
diff --git a/Base/logog/include/statics.hpp b/BaseLib/logog/include/statics.hpp
similarity index 100%
rename from Base/logog/include/statics.hpp
rename to BaseLib/logog/include/statics.hpp
diff --git a/Base/logog/include/string.hpp b/BaseLib/logog/include/string.hpp
similarity index 100%
rename from Base/logog/include/string.hpp
rename to BaseLib/logog/include/string.hpp
diff --git a/Base/logog/include/target.hpp b/BaseLib/logog/include/target.hpp
similarity index 100%
rename from Base/logog/include/target.hpp
rename to BaseLib/logog/include/target.hpp
diff --git a/Base/logog/include/thread.hpp b/BaseLib/logog/include/thread.hpp
similarity index 100%
rename from Base/logog/include/thread.hpp
rename to BaseLib/logog/include/thread.hpp
diff --git a/Base/logog/include/timer.hpp b/BaseLib/logog/include/timer.hpp
similarity index 100%
rename from Base/logog/include/timer.hpp
rename to BaseLib/logog/include/timer.hpp
diff --git a/Base/logog/include/topic.hpp b/BaseLib/logog/include/topic.hpp
similarity index 100%
rename from Base/logog/include/topic.hpp
rename to BaseLib/logog/include/topic.hpp
diff --git a/Base/logog/include/unittest.hpp b/BaseLib/logog/include/unittest.hpp
similarity index 100%
rename from Base/logog/include/unittest.hpp
rename to BaseLib/logog/include/unittest.hpp
diff --git a/Base/logog/readme.txt b/BaseLib/logog/readme.txt
similarity index 100%
rename from Base/logog/readme.txt
rename to BaseLib/logog/readme.txt
diff --git a/Base/logog/src/api.cpp b/BaseLib/logog/src/api.cpp
similarity index 100%
rename from Base/logog/src/api.cpp
rename to BaseLib/logog/src/api.cpp
diff --git a/Base/logog/src/checkpoint.cpp b/BaseLib/logog/src/checkpoint.cpp
similarity index 100%
rename from Base/logog/src/checkpoint.cpp
rename to BaseLib/logog/src/checkpoint.cpp
diff --git a/Base/logog/src/formatter.cpp b/BaseLib/logog/src/formatter.cpp
similarity index 100%
rename from Base/logog/src/formatter.cpp
rename to BaseLib/logog/src/formatter.cpp
diff --git a/Base/logog/src/lobject.cpp b/BaseLib/logog/src/lobject.cpp
similarity index 100%
rename from Base/logog/src/lobject.cpp
rename to BaseLib/logog/src/lobject.cpp
diff --git a/Base/logog/src/logog.vcproj b/BaseLib/logog/src/logog.vcproj
similarity index 100%
rename from Base/logog/src/logog.vcproj
rename to BaseLib/logog/src/logog.vcproj
diff --git a/Base/logog/src/lstring.cpp b/BaseLib/logog/src/lstring.cpp
similarity index 100%
rename from Base/logog/src/lstring.cpp
rename to BaseLib/logog/src/lstring.cpp
diff --git a/Base/logog/src/message.cpp b/BaseLib/logog/src/message.cpp
similarity index 100%
rename from Base/logog/src/message.cpp
rename to BaseLib/logog/src/message.cpp
diff --git a/Base/logog/src/mutex.cpp b/BaseLib/logog/src/mutex.cpp
similarity index 100%
rename from Base/logog/src/mutex.cpp
rename to BaseLib/logog/src/mutex.cpp
diff --git a/Base/logog/src/node.cpp b/BaseLib/logog/src/node.cpp
similarity index 100%
rename from Base/logog/src/node.cpp
rename to BaseLib/logog/src/node.cpp
diff --git a/Base/logog/src/platform.cpp b/BaseLib/logog/src/platform.cpp
similarity index 100%
rename from Base/logog/src/platform.cpp
rename to BaseLib/logog/src/platform.cpp
diff --git a/Base/logog/src/socket.cpp b/BaseLib/logog/src/socket.cpp
similarity index 100%
rename from Base/logog/src/socket.cpp
rename to BaseLib/logog/src/socket.cpp
diff --git a/Base/logog/src/statics.cpp b/BaseLib/logog/src/statics.cpp
similarity index 100%
rename from Base/logog/src/statics.cpp
rename to BaseLib/logog/src/statics.cpp
diff --git a/Base/logog/src/target.cpp b/BaseLib/logog/src/target.cpp
similarity index 100%
rename from Base/logog/src/target.cpp
rename to BaseLib/logog/src/target.cpp
diff --git a/Base/logog/src/timer.cpp b/BaseLib/logog/src/timer.cpp
similarity index 100%
rename from Base/logog/src/timer.cpp
rename to BaseLib/logog/src/timer.cpp
diff --git a/Base/logog/src/topic.cpp b/BaseLib/logog/src/topic.cpp
similarity index 100%
rename from Base/logog/src/topic.cpp
rename to BaseLib/logog/src/topic.cpp
diff --git a/Base/logog/src/unittest.cpp b/BaseLib/logog/src/unittest.cpp
similarity index 100%
rename from Base/logog/src/unittest.cpp
rename to BaseLib/logog/src/unittest.cpp
diff --git a/Base/logog/test/CMakeLists.txt b/BaseLib/logog/test/CMakeLists.txt
similarity index 100%
rename from Base/logog/test/CMakeLists.txt
rename to BaseLib/logog/test/CMakeLists.txt
diff --git a/Base/logog/test/test.cpp b/BaseLib/logog/test/test.cpp
similarity index 100%
rename from Base/logog/test/test.cpp
rename to BaseLib/logog/test/test.cpp
diff --git a/Base/logog/test/test.sln b/BaseLib/logog/test/test.sln
similarity index 100%
rename from Base/logog/test/test.sln
rename to BaseLib/logog/test/test.sln
diff --git a/Base/logog/test/test.vcproj b/BaseLib/logog/test/test.vcproj
similarity index 100%
rename from Base/logog/test/test.vcproj
rename to BaseLib/logog/test/test.vcproj
diff --git a/Base/logog/test/test.vcproj.lnt b/BaseLib/logog/test/test.vcproj.lnt
similarity index 100%
rename from Base/logog/test/test.vcproj.lnt
rename to BaseLib/logog/test/test.vcproj.lnt
diff --git a/Base/printList.h b/BaseLib/printList.h
similarity index 100%
rename from Base/printList.h
rename to BaseLib/printList.h
diff --git a/Base/quicksort.h b/BaseLib/quicksort.h
similarity index 100%
rename from Base/quicksort.h
rename to BaseLib/quicksort.h
diff --git a/Base/swap.h b/BaseLib/swap.h
similarity index 100%
rename from Base/swap.h
rename to BaseLib/swap.h
diff --git a/Base/uniqueListInsert.h b/BaseLib/uniqueListInsert.h
similarity index 100%
rename from Base/uniqueListInsert.h
rename to BaseLib/uniqueListInsert.h
diff --git a/Base/wait.h b/BaseLib/wait.h
similarity index 100%
rename from Base/wait.h
rename to BaseLib/wait.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e41c62e4db0..43a63556950 100644
--- a/CMakeLists.txt
+++ b/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 )
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index fe8840c4524..200660be928 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -7,7 +7,7 @@ ADD_LIBRARY(FileIO STATIC ${SOURCES})
 
 include_directories(
 	.
-	../Base
+	../BaseLib
 	../GeoLib
 	../MathLib
 	../MeshLib
diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt
index 5f68fd5c5e7..f9a06b17573 100644
--- a/GeoLib/CMakeLists.txt
+++ b/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
 )
 
diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt
index 6eb716e444f..d7eb5f51a97 100644
--- a/MathLib/CMakeLists.txt
+++ b/MathLib/CMakeLists.txt
@@ -25,7 +25,7 @@ ENDIF ()
 
 INCLUDE_DIRECTORIES (
 	.
-	../Base
+	../BaseLib
 	../GeoLib
 )
 
diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index d7521eae62c..dede18852dd 100644
--- a/MeshLib/CMakeLists.txt
+++ b/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
 )
diff --git a/SimpleTests/MatrixTests/CMakeLists.txt b/SimpleTests/MatrixTests/CMakeLists.txt
index fad2305d98d..5ba6cd6b9a2 100644
--- a/SimpleTests/MatrixTests/CMakeLists.txt
+++ b/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
 )
 
diff --git a/SimpleTests/MeshTests/CMakeLists.txt b/SimpleTests/MeshTests/CMakeLists.txt
index 7a52b603aa6..2a224164947 100644
--- a/SimpleTests/MeshTests/CMakeLists.txt
+++ b/SimpleTests/MeshTests/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 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
 )
 
diff --git a/SimpleTests/SolverTests/CMakeLists.txt b/SimpleTests/SolverTests/CMakeLists.txt
index ff23854b4b5..33ead38b71b 100644
--- a/SimpleTests/SolverTests/CMakeLists.txt
+++ b/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
 )
 
-- 
GitLab