fix(standard-compositions): removed print statements which fail on gcc builds
also update rpaths in pc
This commit is contained in:
2
Doxyfile
2
Doxyfile
@@ -48,7 +48,7 @@ PROJECT_NAME = fourdst::libcomposition
|
||||
# could be handy for archiving the generated documentation or if some version
|
||||
# control system is used.
|
||||
|
||||
PROJECT_NUMBER = v2.4.1
|
||||
PROJECT_NUMBER = v2.4.2
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||
# for a project that appears at the top of each page and should give viewers a
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
# *********************************************************************** #
|
||||
project('libcomposition', 'cpp', version: 'v2.4.1', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
|
||||
project('libcomposition', 'cpp', version: 'v2.4.2', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
|
||||
|
||||
# Add default visibility for all C++ targets
|
||||
add_project_arguments('-fvisibility=default', language: 'cpp')
|
||||
@@ -50,8 +50,8 @@ if get_option('pkg_config')
|
||||
name: 'libcomposition',
|
||||
description: 'Composition module for SERiF and related projects',
|
||||
version: meson.project_version(),
|
||||
libraries: [libcomposition],
|
||||
libraries: [libcomposition, '-Wl,-rpath,${libdir}'],
|
||||
filebase: 'fourdst_composition',
|
||||
install_dir: join_paths(get_option('libdir'), 'pkgconfig')
|
||||
)
|
||||
endif
|
||||
endif
|
||||
@@ -66,9 +66,6 @@ namespace fourdst:: composition::io {
|
||||
// LOG_TRACE_L1(m_logger, "Parsing chemical abundance for: {}", scheme);
|
||||
|
||||
bool debug = false;
|
||||
if (debug){
|
||||
std::println("Parsing chemical abundance for: {}", scheme);
|
||||
}
|
||||
|
||||
std::istringstream stream(std::string(data.begin(), data.end()));
|
||||
|
||||
@@ -139,12 +136,6 @@ namespace fourdst:: composition::io {
|
||||
// raise error ("Scheme {} not found", scheme)
|
||||
|
||||
|
||||
if (debug){
|
||||
std::println("he_abundance: {}", comp.he_abundance);
|
||||
std::println("requires_atomic_weight: {}", comp.requires_atomic_weight);
|
||||
std::println("elements: {}",comp.elements);
|
||||
std::println("abundances: {}", comp.abundances);
|
||||
}
|
||||
|
||||
return comp;
|
||||
|
||||
@@ -159,9 +150,6 @@ namespace fourdst:: composition::io {
|
||||
// IsotopicPercentage object
|
||||
|
||||
bool debug = false;
|
||||
if (debug){
|
||||
std::println("Parsing Isotopic Percentage for: {}", scheme);
|
||||
}
|
||||
|
||||
std::istringstream stream(std::string(data.begin(), data.end()));
|
||||
|
||||
@@ -232,12 +220,6 @@ namespace fourdst:: composition::io {
|
||||
i+=1;
|
||||
}
|
||||
|
||||
if (debug){
|
||||
std::println("atomic_numbers: {}", iso.atomic_numbers);
|
||||
std::println("elements: {}",iso.elements);
|
||||
std::println("mass_numbers: {}", iso.mass_numbers);
|
||||
std::println("percentages: {}", iso.percentages);
|
||||
}
|
||||
|
||||
return iso;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user