From cb4fbe92a70e7eeb7a4ec67a528f718b0561adcd Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Tue, 13 Oct 2020 16:07:56 +0200
Subject: [PATCH] fixed line breaks in cmakelists.txt
---
CMakeModules/CorsikaUtilities.cmake | 6 +++---
Documentation/Doxygen/Doxyfile.in | 4 ++--
Framework/Particles/ParticleProperties.h | 3 ++-
Framework/Particles/pdxml_reader.py | 7 ++++---
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/CMakeModules/CorsikaUtilities.cmake b/CMakeModules/CorsikaUtilities.cmake
index bbad98612..4304dca93 100644
--- a/CMakeModules/CorsikaUtilities.cmake
+++ b/CMakeModules/CorsikaUtilities.cmake
@@ -209,9 +209,9 @@ function (CORSIKA_ADD_EXAMPLE)
COMMAND ${CMAKE_COMMAND} -E echo ""
COMMAND ${CMAKE_COMMAND} -E echo "**************************************"
COMMAND ${CMAKE_COMMAND} -E echo "***** running example: ${name} " ${run_options} VERBATIM
- COMMAND gdb -ex "run ${run_options}" -ex bt -ex "info locals" -ex "up" -ex "info locals" \
- -ex "up"-ex "info locals" -ex "up" -ex "info locals" \
- -ex quit ${CMAKE_CURRENT_BINARY_DIR}/${name} \
+ COMMAND gdb -ex "run ${run_options}" -ex bt -ex "info locals" -ex "up" -ex "info locals"
+ -ex "up"-ex "info locals" -ex "up" -ex "info locals"
+ -ex quit ${CMAKE_CURRENT_BINARY_DIR}/${name}
VERBATIM
gdb -ex 'run arg1 arg2' -ex bt -ex quit ./program
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/example_outputs)
diff --git a/Documentation/Doxygen/Doxyfile.in b/Documentation/Doxygen/Doxyfile.in
index 77031e96d..2b6c5cb9d 100644
--- a/Documentation/Doxygen/Doxyfile.in
+++ b/Documentation/Doxygen/Doxyfile.in
@@ -7,11 +7,11 @@ GENERATE_XML = YES
OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/
INPUT = @PROJECT_SOURCE_DIR@ @PROJECT_BINARY_DIR@/Framework
-EXCLUDE_PATTERNS = */ThirdParty/*/*
+EXCLUDE_PATTERNS = */ThirdParty/*/* */build*/*
FULL_PATH_NAMES = YES
STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@
-FILE_PATTERNS = *.cc *.cpp *.cxx *.h *.dox *.inc *.md
+FILE_PATTERNS = *.cc *.cpp *.cxx *.h *.hpp *.dox *.inc *.md
EXTENSION_MAPPING = inc=C++
RECURSIVE = YES
diff --git a/Framework/Particles/ParticleProperties.h b/Framework/Particles/ParticleProperties.h
index d217aa50b..5c76e008c 100644
--- a/Framework/Particles/ParticleProperties.h
+++ b/Framework/Particles/ParticleProperties.h
@@ -54,7 +54,6 @@ namespace corsika::particles {
int constexpr GetNucleusA(Code const);
int constexpr GetNucleusZ(Code const);
-#include <corsika/particles/GeneratedParticleProperties.inc>
/*!
* returns mass of particle in natural units
@@ -153,3 +152,5 @@ namespace corsika::particles {
}
} // namespace corsika::particles
+
+#include <corsika/particles/GeneratedParticleProperties.inc>
diff --git a/Framework/Particles/pdxml_reader.py b/Framework/Particles/pdxml_reader.py
index 8c80bec90..16978d643 100755
--- a/Framework/Particles/pdxml_reader.py
+++ b/Framework/Particles/pdxml_reader.py
@@ -447,7 +447,8 @@ def gen_classes(particle_db):
#
def inc_start():
string = ('// generated by pdxml_reader.py\n'
- '// MANUAL EDITS ON OWN RISK. THEY WILL BE OVERWRITTEN. \n')
+ '// MANUAL EDITS ON OWN RISK. THEY WILL BE OVERWRITTEN. \n'
+ 'namespace corsika::particles {\n')
return string
@@ -463,14 +464,14 @@ def detail_start():
#
#
def detail_end():
- string = "\n}//end namespace detail\n"
+ string = "\n} // end namespace detail\n"
return string
###############################################################
#
#
def inc_end():
- string = ""
+ string = "\n} // end namespace corsika::particles\n"
return string
--
GitLab