Skip to content

Commit c3a4548

Browse files
maureeungaromaureeungaro
committed
using expat lib when using geant4 physics, not given by geant4 config, forcing libdir to be lib in build system, removing lib64 references, fix plugin loading for meson testing
1 parent 8ff588b commit c3a4548

59 files changed

Lines changed: 146 additions & 311 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ci/env.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ function show_installation {
1717
echo "- Content of \$GEMC/lib=$GEMC/lib"
1818
ls -lrt $GEMC/lib
1919
fi
20-
if [ -d $GEMC/lib64 ]; then
21-
echo "- Content of \$GEMC/lib64=$GEMC/lib64"
22-
ls -lrt $GEMC/lib64
23-
fi
2420
}
2521

2622
function sanitize_options {

‎eventDispenser/eventDispenserConventions.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
#ifndef EVENTDISPENSER_H_CONVENTIONS
2-
#define EVENTDISPENSER_H_CONVENTIONS 1
1+
#pragma once
32

43
#define EVENTDISPENSERLOGMSGITEM " ⋿"
54

65
// error codes in the 700s
76
#define EC__EVENTDISTRIBUTIONFILENOTFOUND 701
87

9-
#endif
8+

‎eventDispenser/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ LD += {
1414
'examples' : {
1515
'test_event_dispenser' : [files('examples/event_dispenser_example.cc'), ['-run_weights=' + meson.current_source_dir() + '/examples/runWeights.txt', '-n=1000', ]],
1616
'test_event_dispenser_with_file' : [files('examples/event_dispenser_example.cc'), ['-run_weights=' + meson.current_source_dir() + '/examples/runWeights.txt', '-n=1000']],
17-
'test_event_dispenser_with_file_debug' : [files('examples/event_dispenser_example.cc'), ['-run_weights=' + meson.current_source_dir() + '/examples/runWeights.txt', '-n=1000', '-verbosity.eventdispenser=2', '-debug.eventdispenser=true']]
17+
'test_event_dispenser_with_file_verbose' : [files('examples/event_dispenser_example.cc'), ['-run_weights=' + meson.current_source_dir() + '/examples/runWeights.txt', '-n=1000', '-verbosity.eventdispenser=2', '-debug.eventdispenser=true']]
1818
}
1919
}

‎g4dialog/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ moc_headers = files(
2121

2222
examples = {
2323
'test_g4dialog' : [files('examples/g4dialog_example.cc'), ['-gui']],
24-
'test_g4dialog_debug' : [files('examples/g4dialog_example.cc'), ['-gui', '-debug.g4dialog=true', '-verbosity.g4dialog=2']],
24+
'test_g4dialog_verbose' : [files('examples/g4dialog_example.cc'), ['-gui', '-debug.g4dialog=true', '-verbosity.g4dialog=2']],
2525
}
2626

2727

‎g4display/g4SceneProperties.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#ifndef G4SCENE_PROPERTIES
2-
#define G4SCENE_PROPERTIES 1
1+
#pragma once
32

43
/**
54
* \file G4SceneProperties.h
@@ -75,4 +74,3 @@ class G4SceneProperties {
7574
std::shared_ptr<GLogger> log; ///< Logger instance for logging messages.
7675
};
7776

78-
#endif

‎g4display/g4displayConventions.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#ifndef G4DISPLAY_H_CONVENTIONS
2-
#define G4DISPLAY_H_CONVENTIONS 1
1+
#pragma once
32

43
// Notice: with qt6 we do not have access anymore to OGL, but the examples still do.
54
// This can be a potential problem in the future.
@@ -18,4 +17,3 @@
1817

1918
extern std::vector<std::string> AVAILABLEG4VIEWERS;
2019

21-
#endif

‎g4display/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ qrc_examples_sources = files(
2929

3030
examples = {
3131
'test_g4display' : [files('examples/g4display_example.cc'), [meson.current_source_dir() + '/examples/example.yaml', '-gui']],
32-
'test_g4display_debug' : [files('examples/g4display_example.cc'), [meson.current_source_dir() + '/examples/example.yaml', '-gui', '-verbosity.g4display=2', '-debug.g4display=true']]
32+
'test_g4display_verbose' : [files('examples/g4display_example.cc'), [meson.current_source_dir() + '/examples/example.yaml', '-gui', '-verbosity.g4display=2', '-debug.g4display=true']]
3333
}
3434

3535
if get_option('i_test')

‎g4display/tabs/g4displayutilities.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#ifndef G4DISPLAYUTILITIES_H
2-
#define G4DISPLAYUTILITIES_H 1
1+
#pragma once
32

43
/**
54
* \file g4displayutilities.h
@@ -68,4 +67,3 @@ class G4DisplayUtilities : public QWidget {
6867
std::shared_ptr<GLogger> log; ///< Logger instance for logging messages.
6968
};
7069

71-
#endif

‎g4display/tabs/g4displayview.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#ifndef G4DISPLAYVIEW_H
2-
#define G4DISPLAYVIEW_H 1
1+
#pragma once
32

43
// Qt
54
#include <QtWidgets> // Includes necessary Qt Widget headers
@@ -151,4 +150,3 @@ private slots:
151150
void field_precision_changed();
152151
};
153152

154-
#endif // G4DISPLAYVIEW_H

‎g4system/meson.build‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ LD += {
3131
},
3232
'examples' : {
3333
'test_g4system' : [files('examples/g4system_example.cc'), [gsystem, dbhost]],
34-
'test_g4system_verbosity' : [files('examples/g4system_example.cc'), [gsystem, dbhost, '-verbosity.g4system=2']],
35-
'test_g4system_debug' : [files('examples/g4system_example.cc'), [gsystem, dbhost, '-debug.g4system=true']],
34+
'test_g4system_verbose' : [files('examples/g4system_example.cc'), [gsystem, dbhost, '-verbosity.g4system=2', '-debug.g4system=true']],
3635
'test_g4system_overlaps_switch' : [files('examples/g4system_example.cc'), [gsystem, dbhost, '-check_overlaps=1']]
3736
}
3837
}

0 commit comments

Comments
 (0)