Skip to content

Follow up xrl union: Ensure better platform independence via @XRLFLAGS@ #2441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willend merged 3 commits into from
May 6, 2026
+3 −25
Merged

Follow up xrl union: Ensure better platform independence via @XRLFLAGS@ #2441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a04650e
McXtrace/union platform independence: Swap bare -lxrl for @XRLFLAGS@
willend May 6, 2026
a9b2310
Include-path to install share should be automatic already
willend May 6, 2026
9161d68
Pick up from <xraylib/xraylib.h> also on Windows - conda is sane
willend May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions mcxtrace-comps/union/Compton_xrl_process.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ DEFINE COMPONENT Compton_xrl_process
DEFINITION PARAMETERS ()
SETTING PARAMETERS (density=0,atomno=14, string element="", string init="init")
OUTPUT PARAMETERS (This_process,Compton_xrl_storage)
DEPENDENCY "-lxrl"
DEPENDENCY " @XRLFLAGS@ "
/* X-ray parameters: (x,y,z,kx,ky,kz,phi,t,Ex,Ey,Ez,p) */

SHARE
Expand All @@ -65,14 +65,7 @@ SHARE

#endif

/* If on windows this should likely be set like this
* since xraylib.h is not (as a standard) installed
* into an xraylib subdir*/
#ifdef _WIN32
#include <xraylib.h>
#else
#include <xraylib/xraylib.h>
#endif

struct Compton_xrl_physics_storage_struct{
char name[13];
Expand Down
9 changes: 1 addition & 8 deletions mcxtrace-comps/union/KN_xrl_process.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ DEFINE COMPONENT KN_xrl_process
DEFINITION PARAMETERS ()
SETTING PARAMETERS (density=0, string init="init")
OUTPUT PARAMETERS (This_process,KN_xrl_storage)
DEPENDENCY "-lxrl"
DEPENDENCY " @XRLFLAGS@ "
/* X-ray parameters: (x,y,z,kx,ky,kz,phi,t,Ex,Ey,Ez,p) */

SHARE
Expand All @@ -62,14 +62,7 @@ SHARE

#endif

/* If on windows this should likely be set like this
* since xraylib.h is not (as a standard) installed
* into an xraylib subdir*/
#ifdef _WIN32
#include <xraylib.h>
#else
#include <xraylib/xraylib.h>
#endif

struct KN_xrl_physics_storage_struct{
char name[13];
Expand Down
9 changes: 1 addition & 8 deletions mcxtrace-comps/union/Rayleigh_xrl_process.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ DEFINE COMPONENT Rayleigh_xrl_process
DEFINITION PARAMETERS ()
SETTING PARAMETERS (density=0,atomno=14, string element="", string init="init")
OUTPUT PARAMETERS (This_process,Rayleigh_xrl_storage)
DEPENDENCY "-lxrl"
DEPENDENCY " @XRLFLAGS@ "
/* X-ray parameters: (x,y,z,kx,ky,kz,phi,t,Ex,Ey,Ez,p) */

SHARE
Expand All @@ -64,14 +64,7 @@ SHARE

#endif

/* If on windows this should likely be set like this
* since xraylib.h is not (as a standard) installed
* into an xraylib subdir*/
#ifdef _WIN32
#include <xraylib.h>
#else
#include <xraylib/xraylib.h>
#endif

struct Rayleigh_xrl_physics_storage_struct{
char name[13];
Expand Down
1 change: 0 additions & 1 deletion mcxtrace-comps/union/Union_master.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ SETTING PARAMETERS(verbal = 1,
inherit_number_of_scattering_events=0,
string init="init")
OUTPUT PARAMETERS ()
DEPENDENCY "-I@MCCODE_LIB@/share/"
NOACC

/* X-ray parameters: (x,y,z,kx,ky,kz,t,phi,Ex,Ey,Ez,p) */
Expand Down
Loading