Merge pull request #1855 from McStasMcXtrace/willend-NCRYSTALFLAGS

Implement support for @NCRYSTALFLAGS@ in mcrun etc

Author: willend

buildscripts/build_debs_mcstas

@@ -72,7 +72,7 @@ mv $DEB $WORK/dist/$DEBNAME
 
 cd $WORK
 
-cd 3rdparty/ncrystal
+cd 3rdparty/ncrystal/ncrystal_core
 rm -rf build
 mkdir build
 cd build

buildscripts/build_debs_mcstas32

@@ -72,7 +72,7 @@ mv $DEB $WORK/dist/$DEBNAME
 
 cd $WORK
 
-cd 3rdparty/ncrystal
+cd 3rdparty/ncrystal/ncrystal_core
 rm -rf build
 mkdir build
 cd build

buildscripts/build_debs_mcstas_arm64

@@ -72,7 +72,7 @@ mv $DEB $WORK/dist/$DEBNAME
 
 cd $WORK
 
-cd 3rdparty/ncrystal
+cd 3rdparty/ncrystal/ncrystal_core
 rm -rf build
 mkdir build
 cd build

cmake/Modules/PlatformDefaults.cmake

@@ -72,13 +72,23 @@ function( detect_platform_variables resultvarname )
   endif()
   provide_var( EDITOR )
 
-  #idf-generator:
+  #McStas/McXtrace switches:
+  # - idf-generator
+  # - NCrystal flags
   if ( BUILD_MCSTAS )
     set( IDFGEN mcdisplay-mantid )
+    set( NCRYSTALFLAGS "CMD(ncrystal-config --show buildflags)" )
+
+    # Temporary solution for NCrystal on Windows 'MingW cross-compiled' systems
+    if ( WINDOWS AND NOT MCCODE_BUILD_CONDA_PKG )
+      set( NCRYSTALFLAGS "-Wl,-rpath,CMD(ncrystal-config --show libdir) -Wl,CMD(ncrystal-config --show libpath) -ICMD(ncrystal-config --show includedir)" )
+    endif()
   else()
     set( IDFGEN "" )
+    set( NCRYSTALFLAGS "")
   endif()
   provide_var( IDFGEN )
+  provide_var( NCRYSTALFLAGS )
 
   #HDF viewer
   if ( NOT HDFVIEW )

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 "CMD(ncrystal-config --show buildflags)"
+DEPENDENCY "@NCRYSTALFLAGS@"
 NOACC /* Notice: you must remove this line if using the legacy McStas 2.x branch. */
 
 SHARE

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 "CMD(ncrystal-config --show buildflags)"
+DEPENDENCY "@NCRYSTALFLAGS@"
 
 SHARE
 %{

meta-pkgs/windows/environment.yml

@@ -26,6 +26,7 @@ dependencies:
   - nexusformat
   - nexpy
   - hdf5
+  - ncrystal
   - xraylib
   - jupytext
   - jupyterlab

tools/Python/mccodelib/CMakeLists.txt

@@ -92,7 +92,7 @@ include(CPack)
 
 set(WORK "${PROJECT_BINARY_DIR}/work")
 
-set(entries_with_conda_prefix "CFLAGS;NEXUSFLAGS;MPIFLAGS;GSLFLAGS;XRLFLAGS;OACCFLAGS;TOOLS_CC;MPIRUN;MPICC")
+set(entries_with_conda_prefix "CFLAGS;NEXUSFLAGS;MPIFLAGS;NCRYSTALFLAGS;GSLFLAGS;XRLFLAGS;OACCFLAGS;TOOLS_CC;MPIRUN;MPICC")
 foreach( var ${entries_with_conda_prefix} )
   set( MCCODE_FINAL_${var} "${${var}}" )
 endforeach()

tools/Python/mccodelib/mccode_config.json.in

@@ -25,6 +25,7 @@
     "NEXUSFLAGS": "@MCCODE_FINAL_NEXUSFLAGS@",
     "MPIFLAGS": "@MCCODE_FINAL_MPIFLAGS@",
     "GSLFLAGS": "@MCCODE_FINAL_GSLFLAGS@",
+    "NCRYSTALFLAGS": "@MCCODE_FINAL_NCRYSTALFLAGS@",
     "XRLFLAGS": "@MCCODE_FINAL_XRLFLAGS@",
     "OACCFLAGS": "@MCCODE_FINAL_OACCFLAGS@",
     "CC": "@MCCODE_FINAL_TOOLS_CC@",

tools/Python/mcrun/mccode.py

@@ -249,6 +249,9 @@ def x_path(file):
                 # Insert NEXUSFLAGS if instrument/comps request this
                 flags = re.sub(r'\@NEXUSFLAGS\@', mccode_config.compilation['NEXUSFLAGS'], flags)
 
+                # Insert NCRYSTALFLAGS if instrument/comps request this
+                flags = re.sub(r'\@NCRYSTALFLAGS\@', mccode_config.compilation['NCRYSTALFLAGS'], flags)
+
                 # Insert GSLFLAGS if instrument/comps request this
                 flags = re.sub(r'\@GSLFLAGS\@', mccode_config.compilation['GSLFLAGS'], flags)