Merge pull request #1848 from McStasMcXtrace/ncrystal-4-patches

Various NCrystal 4.0.0 related patches
McStasMcXtrace · Feb 10, 2025 · c3fe746 · c3fe746
2 parents a914d82 + f7ea4fd
commit c3fe746
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/buildscripts/build_windows_mcstas b/buildscripts/build_windows_mcstas
@@ -57,7 +57,6 @@ export MCCODE_USE_LEGACY_DESTINATIONS=ON
 ./mkdist mcstas-tools-python-mcdisplay-cad $1 tools/Python/mcdisplay/cad/ "" mingw64 "" -- nsis64
 ./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" mingw64 "" -- nsis64
 ./mkdist mcstas-tools-python-mcdoc $1 tools/Python/mcdoc/ "" mingw64 "" -- nsis64
-./mkdist mcstas-ncrystal $1 3rdparty/ncrystal-package "" mingw64 "" -- nsis64
 ./mkdist mcstas-mcpl $1 3rdparty/mcpl-package "" mingw64 "" -- nsis64
 
 if [ "x$2" != "x" ]; then

diff --git a/mcstas-comps/contrib/NCrystal_sample.comp → mcstas-comps/samples/NCrystal_sample.comp b/mcstas-comps/contrib/NCrystal_sample.comp → mcstas-comps/samples/NCrystal_sample.comp
@@ -66,7 +66,7 @@
 
 DEFINE COMPONENT NCrystal_sample
 SETTING PARAMETERS (string cfg="void", absorptionmode=1, multscat=1, xwidth=0, yheight=0, zdepth=0, radius=0 )
-DEPENDENCY "-Wl,-rpath,CMD(ncrystal-config --show libdir) -Wl,CMD(ncrystal-config --show libpath) -ICMD(ncrystal-config --show includedir)"
+DEPENDENCY "CMD(ncrystal-config --show buildflags)"
 NOACC /* Notice: you must remove this line if using the legacy McStas 2.x branch. */
 
 SHARE

diff --git a/mcstas-comps/union/NCrystal_process.comp b/mcstas-comps/union/NCrystal_process.comp
@@ -95,7 +95,7 @@
 DEFINE COMPONENT NCrystal_process // Remember to change the name of process here
 
 SETTING PARAMETERS(string cfg = "", packing_factor=1, interact_fraction=-1, string init="init")
-DEPENDENCY "-Wl,-rpath,CMD(ncrystal-config --show libdir) -Wl,CMD(ncrystal-config --show libpath) -ICMD(ncrystal-config --show includedir)"
+DEPENDENCY "CMD(ncrystal-config --show buildflags)"
 
 SHARE
 %{

diff --git a/meta-pkgs/windows/environment.yml b/meta-pkgs/windows/environment.yml
@@ -26,6 +26,7 @@ dependencies:
   - nexpy
   - hdf5
   - xraylib
+  - ncrystal
   - jupytext
   - jupyterlab
   - ipympl
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ dependencies: @@
       - nexpy
       - hdf5
       - xraylib
+      - ncrystal
       - jupytext
       - jupyterlab
       - ipympl
@@ Expand Down @@