From 7a39ae0ac6533ffed349c29a0e4040412e948588 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 23 Jan 2022 20:45:02 +0000
Subject: [PATCH] CMakeLists.txt: set_diagnostic_flags (-Werror)
---
CMakeLists.txt | 8 +++-----
src/FileLoader.cpp | 6 +++---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36e9c1ee..fd6a239f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,13 +10,11 @@ PROJECT(athena
)
set(CMAKE_CXX_STANDARD 17)
-find_package( DD4hep REQUIRED COMPONENTS DDCore DDG4)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+find_package(DD4hep REQUIRED COMPONENTS DDCore DDG4)
find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep )
-
-find_package(fmt)
-#find_library(FMT_LIBRARY fmt)
-
+find_package(fmt REQUIRED)
#-----------------------------------------------------------------------------------
set(a_lib_name athena)
diff --git a/src/FileLoader.cpp b/src/FileLoader.cpp
index d0d60872..25a5c7e5 100644
--- a/src/FileLoader.cpp
+++ b/src/FileLoader.cpp
@@ -68,9 +68,9 @@ long load_file(
"_",
pos + 1);
if (after == std::string::npos) after = cache.size(); // cache ends on env var
- auto env_name = cache.substr(pos + 1, after - pos - 1);
- auto env_value = std::getenv(env_name.c_str());
- if (env_value == nullptr) env_value = "";
+ const std::string env_name(cache.substr(pos + 1, after - pos - 1));
+ auto env_ptr = std::getenv(env_name.c_str());
+ const std::string env_value(env_ptr != nullptr ? env_ptr : "");
cache.erase(pos, after - pos);
cache.insert(pos, env_value);
printout(INFO, "FileLoader", "$" + env_name + " -> " + env_value);
--
GitLab