From 0905b5ea30895ff4175ea602b22287ce08b5dfdf Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 21 Aug 2019 13:39:31 +0200
Subject: [PATCH] Dropped unused variables from InfoLibs
---
InfoLib/CMakeLists.txt | 6 +-----
InfoLib/CompilerInfo.cpp.in | 24 ------------------------
InfoLib/CompilerInfo.h | 28 ----------------------------
InfoLib/TestInfo.cpp.in | 2 --
InfoLib/TestInfo.h | 2 --
5 files changed, 1 insertion(+), 61 deletions(-)
delete mode 100644 InfoLib/CompilerInfo.cpp.in
delete mode 100644 InfoLib/CompilerInfo.h
diff --git a/InfoLib/CMakeLists.txt b/InfoLib/CMakeLists.txt
index 977a9f2aaea..c785fccfa12 100644
--- a/InfoLib/CMakeLists.txt
+++ b/InfoLib/CMakeLists.txt
@@ -1,8 +1,4 @@
-foreach(lib
- Compiler
- Git
- CMake
- Test)
+foreach(lib Git CMake Test)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${lib}Info.cpp.in
${CMAKE_CURRENT_BINARY_DIR}/${lib}Info.cpp @ONLY)
diff --git a/InfoLib/CompilerInfo.cpp.in b/InfoLib/CompilerInfo.cpp.in
deleted file mode 100644
index c290f27543c..00000000000
--- a/InfoLib/CompilerInfo.cpp.in
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * \brief Build information.
- *
- * \copyright
- * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
- * Distributed under a Modified BSD License.
- * See accompanying file LICENSE.txt or
- * http://www.opengeosys.org/project/license
- *
- */
-
-#include "InfoLib/CompilerInfo.h"
-
-namespace CompilerInfoLib
-{
-
-namespace CompilerInfo
-{
- const std::string cmake_cxx_compiler("@CMAKE_CXX_COMPILER@");
- const std::string cmake_cxx_flags("@CMAKE_CXX_FLAGS@");
- const std::string cmake_cxx_flags_release("@CMAKE_CXX_FLAGS_RELEASE@");
- const std::string cmake_cxx_flags_debug("@CMAKE_CXX_FLAGS_DEBUG@");
-}
-}
diff --git a/InfoLib/CompilerInfo.h b/InfoLib/CompilerInfo.h
deleted file mode 100644
index 96acfc0b7e8..00000000000
--- a/InfoLib/CompilerInfo.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * \brief Build information.
- *
- * \copyright
- * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
- * Distributed under a Modified BSD License.
- * See accompanying file LICENSE.txt or
- * http://www.opengeosys.org/project/license
- *
- */
-
-#pragma once
-
-#include <string>
-
-#include "compilerinfolib_export.h"
-
-namespace CompilerInfoLib
-{
-
-namespace CompilerInfo
-{
- extern COMPILERINFOLIB_EXPORT const std::string cmake_cxx_compiler; // all not used
- extern COMPILERINFOLIB_EXPORT const std::string cmake_cxx_flags;
- extern COMPILERINFOLIB_EXPORT const std::string cmake_cxx_flags_release;
- extern COMPILERINFOLIB_EXPORT const std::string cmake_cxx_flags_debug;
- } // namespace BuildInfo
- } // namespace BaseLib
diff --git a/InfoLib/TestInfo.cpp.in b/InfoLib/TestInfo.cpp.in
index 3d16ad2371a..abef28b565b 100644
--- a/InfoLib/TestInfo.cpp.in
+++ b/InfoLib/TestInfo.cpp.in
@@ -16,9 +16,7 @@ namespace TestInfoLib
namespace TestInfo
{
- // const std::string source_path("@CMAKE_CURRENT_SOURCE_DIR@");
const std::string data_path("@Data_SOURCE_DIR@");
- // const std::string data_binary_path("@Data_BINARY_DIR@");
const std::string tests_tmp_path("@PROJECT_BINARY_DIR@/Tests/");
}
}
diff --git a/InfoLib/TestInfo.h b/InfoLib/TestInfo.h
index 3461b354d00..0ac030b0269 100644
--- a/InfoLib/TestInfo.h
+++ b/InfoLib/TestInfo.h
@@ -20,9 +20,7 @@ namespace TestInfoLib
namespace TestInfo
{
- // extern INFOLIB_EXPORT const std::string source_path; // not used
extern TESTINFOLIB_EXPORT const std::string data_path;
- // extern INFOLIB_EXPORT const std::string data_binary_path; // not used
extern TESTINFOLIB_EXPORT const std::string tests_tmp_path;
} // namespace
} // namespace
--
GitLab