Remove OGS_BUILD_INFO, which is always generated.

CMakeLists.txt

@@ -81,11 +81,6 @@ IF (OGS_CMAKE_DEBUG)
 	list_all_cmake_variable_values()
 ENDIF (OGS_CMAKE_DEBUG)
 
-OPTION(OGS_BUILD_INFO "Should build information be generated" ON)
-IF (OGS_BUILD_INFO)
-	ADD_DEFINITIONS (-DOGS_BUILD_INFO)
-ENDIF (OGS_BUILD_INFO)
-
 # Code coverage
 OPTION(OGS_COVERAGE "Enables code coverage measurements with gcov/lcov." OFF)
 

Gui/DataExplorer.cmake

@@ -105,10 +105,6 @@ IF(MSVC)
 	TARGET_LINK_LIBRARIES( ogs-gui winmm)
 ENDIF(MSVC)
 
-IF(OGS_BUILD_INFO)
-	ADD_DEFINITIONS(-DOGS_BUILD_INFO)
-ENDIF() # OGS_BUILD_INFO
-
 ### OpenSG support ###
 IF (VTKOSGCONVERTER_FOUND)
 	USE_OPENSG(ogs-gui)

Gui/mainwindow.cpp

@@ -119,9 +119,7 @@
 #include "VtkTrackedCamera.h"
 #endif // OGS_USE_VRPN
 
-#ifdef OGS_BUILD_INFO
 #include "BaseLib/BuildInfo.h"
-#endif // OGS_BUILD_INFO
 
 using namespace FileIO;
 

SimpleTests/MatrixTests/MatMult.cpp

@@ -35,9 +35,7 @@
 #include <sys/unistd.h>
 #endif
 
-#ifdef OGS_BUILD_INFO
 #include "BaseLib/BuildInfo.h"
-#endif
 
 #ifdef _OPENMP
 #include <omp.h>
@@ -101,19 +99,17 @@ int main(int argc, char *argv[])
 	// read number of threads
 	unsigned n_threads (n_cores_arg.getValue());
 
-#ifdef OGS_BUILD_INFO
 	INFO("%s was build with compiler %s",
 		argv[0],
 		BaseLib::BuildInfo::cmake_cxx_compiler.c_str());
-	#ifdef NDEBUG
-		INFO("CXX_FLAGS: %s %s",
-			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
-			BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
-	#else
-		INFO("CXX_FLAGS: %s %s",
-			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
-			BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
-	#endif
+#ifdef NDEBUG
+	INFO("CXX_FLAGS: %s %s",
+		BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+		BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
+#else
+	INFO("CXX_FLAGS: %s %s",
+		BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+		BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
 #endif
 
 #ifdef UNIX

SimpleTests/MatrixTests/MatVecMultNDPerm.cpp

@@ -14,9 +14,7 @@
 
 #include <cstdlib>
 
-#ifdef OGS_BUILD_INFO
 #include "BaseLib/BuildInfo.h"
-#endif
 
 #ifdef UNIX
 #include <sys/unistd.h>
@@ -89,19 +87,17 @@ int main(int argc, char *argv[])
 	logog::Cout *logogCout(new logog::Cout);
 	logogCout->SetFormatter(*custom_format);
 
-#ifdef OGS_BUILD_INFO
 	INFO("%s was build with compiler %s",
 		argv[0],
 		BaseLib::BuildInfo::cmake_cxx_compiler.c_str());
-	#ifdef NDEBUG
-		INFO("CXX_FLAGS: %s %s",
-			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
-			BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
-	#else
-		INFO("CXX_FLAGS: %s %s",
-			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
-			BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
-	#endif
+#ifdef NDEBUG
+	INFO("CXX_FLAGS: %s %s",
+		BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+		BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
+#else
+	INFO("CXX_FLAGS: %s %s",
+		BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+		BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
 #endif
 
 #ifdef UNIX

SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp

@@ -34,9 +34,7 @@
 #include <sys/unistd.h>
 #endif
 
-#ifdef OGS_BUILD_INFO
 #include "BaseLib/BuildInfo.h"
-#endif
 
 #ifdef _OPENMP
 #include <omp.h>
@@ -99,19 +97,17 @@ int main(int argc, char *argv[])
 	// read number of threads
 	unsigned n_threads (n_cores_arg.getValue());
 
-#ifdef OGS_BUILD_INFO
 	INFO("%s was build with compiler %s",
 		argv[0],
 		BaseLib::BuildInfo::cmake_cxx_compiler.c_str());
-	#ifdef NDEBUG
-		INFO("CXX_FLAGS: %s %s",
-			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
-			BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
-	#else
-		INFO("CXX_FLAGS: %s %s",
-			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
-			BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
-	#endif
+#ifdef NDEBUG
+	INFO("CXX_FLAGS: %s %s",
+		BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+		BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
+#else
+	INFO("CXX_FLAGS: %s %s",
+		BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+		BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
 #endif
 
 #ifdef UNIX

SimpleTests/MatrixTests/MatVecMultPthreads.cpp

@@ -32,9 +32,7 @@
 #include <sys/unistd.h>
 #endif
 
-#ifdef OGS_BUILD_INFO
 #include "BaseLib/BuildInfo.h"
-#endif
 
 #ifdef HAVE_PTHREADS
 #include <pthread.h>
@@ -93,19 +91,17 @@ int main(int argc, char *argv[])
 		logog_file->SetFormatter( *custom_format );
 	}
 
-#ifdef OGS_BUILD_INFO
-	INFO("%s was build with compiler %s",
-		argv[0],
-		BaseLib::BuildInfo::cmake_cxx_compiler.c_str());
-	#ifdef NDEBUG
-		INFO("CXX_FLAGS: %s %s",
-			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
-			BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
-	#else
-		INFO("CXX_FLAGS: %s %s",
-			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
-			BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
-	#endif
+INFO("%s was build with compiler %s",
+	argv[0],
+	BaseLib::BuildInfo::cmake_cxx_compiler.c_str());
+#ifdef NDEBUG
+	INFO("CXX_FLAGS: %s %s",
+		BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+		BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
+#else
+	INFO("CXX_FLAGS: %s %s",
+		BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+		BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
 #endif
 
 #ifdef UNIX