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

126e506d · Karsten Rink · be8c9837 · 1a30caa1 · 126e506d · 126e506d
Commit 126e506d authored 12 years ago by Karsten Rink
--- a/Base/CMakeLists.txt
+++ b/Base/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)
--- a/Base/CPUTimeTimer.cpp
+++ b/Base/CPUTimeTimer.cpp
--- a/Base/CPUTimeTimer.h
+++ b/Base/CPUTimeTimer.h
--- a/Base/Configure.h.in
+++ b/Base/Configure.h.in
--- a/Base/DateTools.cpp
+++ b/Base/DateTools.cpp
--- a/Base/DateTools.h
+++ b/Base/DateTools.h
--- a/Base/FileFinder.h
+++ b/Base/FileFinder.h
--- a/Base/FileTools.h
+++ b/Base/FileTools.h
--- a/Base/README.md
+++ b/Base/README.md
--- a/Base/RunTimeTimer.cpp
+++ b/Base/RunTimeTimer.cpp
--- a/Base/RunTimeTimer.h
+++ b/Base/RunTimeTimer.h
--- a/Base/StringTools.cpp
+++ b/Base/StringTools.cpp
--- a/Base/StringTools.h
+++ b/Base/StringTools.h
--- a/Base/TimeMeasurementBase.h
+++ b/Base/TimeMeasurementBase.h
--- a/Base/binarySearch.cpp
+++ b/Base/binarySearch.cpp
--- a/Base/binarySearch.h
+++ b/Base/binarySearch.h
--- a/Base/logog/CMakeLists.txt
+++ b/Base/logog/CMakeLists.txt
--- a/Base/logog/doc/make-doxygen.bat
+++ b/Base/logog/doc/make-doxygen.bat
--- a/Base/logog/doc/overview.dox
+++ b/Base/logog/doc/overview.dox
--- a/Base/logog/doxyfile
+++ b/Base/logog/doxyfile