Generate modulefiles which allow compiling O2OpenAccess when loaded

arrow.sh

@@ -119,4 +119,4 @@ find "$INSTALLROOT/share" -name '*-gdb.py' -exec mv {} "$INSTALLROOT/lib" \;
 
 # Modulefile
 mkdir -p "$INSTALLROOT/etc/modulefiles"
-alibuild-generate-module --lib > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
+alibuild-generate-module --lib --cmake > "$INSTALLROOT/etc/modulefiles/$PKGNAME"

boost.sh

@@ -119,7 +119,7 @@ MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 
 mkdir -p etc/modulefiles
-alibuild-generate-module --lib > etc/modulefiles/$PKGNAME
+alibuild-generate-module --lib --cmake > etc/modulefiles/$PKGNAME
 cat << EOF >> etc/modulefiles/$PKGNAME
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EOF

common-o2.sh

@@ -30,7 +30,7 @@ make ${JOBS+-j $JOBS} install
 
 #ModuleFile
 mkdir -p etc/modulefiles
-alibuild-generate-module --lib > etc/modulefiles/$PKGNAME
+alibuild-generate-module --lib --cmake > etc/modulefiles/$PKGNAME
 cat << EOF >> etc/modulefiles/$PKGNAME
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EOF

fairlogger.sh

@@ -7,6 +7,8 @@ requires:
 build_requires:
   - CMake
   - "GCC-Toolchain:(?!osx)"
+  - ninja
+  - alibuild-recipe-tools
 incremental_recipe: |
   cmake --build . --target install ${JOBS:+-- -j$JOBS}
   mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
@@ -24,7 +26,6 @@ case $ARCHITECTURE in
 esac
 mkdir -p $INSTALLROOT
 
-
 cmake $SOURCEDIR                                                 \
       ${CXX_COMPILER:+-DCMAKE_CXX_COMPILER=$CXX_COMPILER}        \
       ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE}  \
@@ -42,21 +43,9 @@ cmake --build . --target install ${JOBS:+-- -j$JOBS}
 
 # ModuleFile
 mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0                                        \
-       ${FMT_REVISION:+fmt/${FMT_VERSION}-${FMT_REVISION}}
-# Our environment
-set FAIRLOGGER_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path LD_LIBRARY_PATH \$FAIRLOGGER_ROOT/lib
-prepend-path ROOT_INCLUDE_PATH \$FAIRLOGGER_ROOT/include
+alibuild-generate-module --lib --cmake > etc/modulefiles/$PKGNAME
+cat >> etc/modulefiles/$PKGNAME <<EoF
+prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EoF
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
 mkdir -p $MODULEDIR && rsync -a --delete etc/modulefiles/ $MODULEDIR

fairroot.sh

@@ -90,7 +90,7 @@ MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 mkdir -p "$MODULEDIR"
 
-alibuild-generate-module --bin --lib > $MODULEFILE
+alibuild-generate-module --bin --lib --cmake > $MODULEFILE
 
 cat >> "$MODULEFILE" <<EoF
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include

fmt.sh

@@ -21,7 +21,7 @@ MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 mkdir -p "$MODULEDIR"
 
-alibuild-generate-module --lib > $MODULEFILE
+alibuild-generate-module --lib --cmake > $MODULEFILE
 cat << EOF >> $MODULEFILE
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EOF

libinfologger.sh

@@ -31,7 +31,7 @@ ninja ${JOBS+-j $JOBS} install
 
 #ModuleFile
 mkdir -p etc/modulefiles
-alibuild-generate-module --bin --lib > etc/modulefiles/$PKGNAME
+alibuild-generate-module --bin --lib --cmake > etc/modulefiles/$PKGNAME
 cat >> etc/modulefiles/$PKGNAME <<EoF
 # Our environment
 set INFOLOGGER_ROOT \$::env(BASEDIR)/$PKGNAME/\$version

libjalieno2.sh

@@ -41,6 +41,7 @@ module load BASE/1.0 ${GCC_TOOLCHAIN_REVISION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERS
 # Our environment
 set LIBJALIENO2_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 prepend-path LD_LIBRARY_PATH \$LIBJALIENO2_ROOT/lib
+prepend-path CMAKE_PREFIX_PATH \$LIBJALIENO2_ROOT
 EoF
 
 mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles

ms_gsl.sh

@@ -6,6 +6,7 @@ prepend_path:
   ROOT_INCLUDE_PATH: "$MS_GSL_ROOT/include"
 build_requires:
   - CMake
+  - alibuild-recipe-tools
   - "GCC-Toolchain:(?!osx)"
 ---
 #!/bin/bash -e
@@ -23,19 +24,7 @@ cmake --build . -- ${JOBS:+-j$JOBS} install
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 mkdir -p "$MODULEDIR"
+alibuild-generate-module --cmake > $MODULEFILE
 cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${GCC_TOOLCHAIN_REVISION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
-# Our environment
-set osname [uname sysname]
-set MS_GSL_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-setenv MS_GSL_ROOT \$MS_GSL_ROOT
-prepend-path ROOT_INCLUDE_PATH \$MS_GSL_ROOT/include
+prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EoF

rapidjson.sh

@@ -22,7 +22,7 @@ ninja ${JOBS:+-j$JOBS} install
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 mkdir -p "$MODULEDIR"
-alibuild-generate-module --lib > $MODULEFILE
+alibuild-generate-module --lib --cmake > $MODULEFILE
 cat << EOF >> $MODULEFILE
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EOF

vc.sh

@@ -19,7 +19,7 @@ make ${JOBS+-j $JOBS} install
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 mkdir -p "$MODULEDIR"
-alibuild-generate-module --lib > $MODULEFILE
+alibuild-generate-module --lib --cmake > $MODULEFILE
 cat >> "$MODULEFILE" <<EoF		
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include		
 EoF