Fixing IO on CI Farm

CMakeLists.txt

@@ -10,6 +10,7 @@ set(SE_CLASS1 CACHE BOOL "Activate compilation with SE_CLASS1")
 set(SE_CLASS2 CACHE BOOL "Activate compilation with SE_CLASS2")
 set(SE_CLASS3 CACHE BOOL "Activate compilation with SE_CLASS3")
 set(ENV{HDF5_ROOT} ${HDF5_ROOT})
+set(OPENFPM_PDATA_DIR CACHE PATH "OpenFPM_pdata dirs")
 
 set (CMAKE_CXX_STANDARD 11)
 set (CMAKE_CUDA_STANDARD 11)

build.sh

@@ -19,7 +19,7 @@ mv /tmp/openfpm_io openfpm_io
 
 git clone git@git.mpi-cbg.de:openfpm/openfpm_devices.git openfpm_devices
 git clone git@git.mpi-cbg.de:openfpm/openfpm_data.git openfpm_data
-git clone git@git.mpi-cbg.de:openfpm/openfpm_pdata.git .
+git clone git@git.mpi-cbg.de:openfpm/openfpm_pdata.git openfpm_pdata
 git clone git@git.mpi-cbg.de:openfpm/openfpm_vcluster.git openfpm_vcluster
 
 cd "$1/openfpm_io"
@@ -61,11 +61,8 @@ then
  module load boost/1.54.0
  sh ./configure CXX=mpic++ --with-boost=/sw/apps/boost/1.54.0/ --with-hdf5=$HOME/$3/HDF5/bin/h5pcc
 else
- sh ./configure CXX=mpic++ --with-hdf5=$HOME/openfpm_dependencies/openfpm_io/$branch/HDF5 --with-boost=$HOME/openfpm_dependencies/openfpm_io/$branch/BOOST 
+ sh ./configure CXX=mpic++ --with-hdf5=$HOME/openfpm_dependencies/openfpm_io/$branch/HDF5 --with-boost=$HOME/openfpm_dependencies/openfpm_io/$branch/BOOST --with-pdata=../openfpm_pdata/src
 fi
-echo "----------------------------------"
-ls ../.
-echo "----------------------------------"
 make VERBOSE=1 -j 4
 
 if [ $? -ne 0 ]; then

configure

@@ -466,6 +466,9 @@ do
       boost)
       conf_options="$conf_options -DBOOST_ROOT=$ac_optarg"
       ;;
+      pdata)
+      conf_options="$conf_options -DOPENFPM_PDATA_DIR=$ac_optarg"
+      ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac

src/CMakeLists.txt

@@ -25,6 +25,7 @@ target_include_directories (io PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
 target_include_directories (io PUBLIC ${HDF5_ROOT}/include)
 target_include_directories (io PUBLIC ${TINYOBJLOADER_INCLUDE_DIRS} )
 target_include_directories (io PUBLIC ${Boost_INCLUDE_DIRS})
+target_include_directories (io PUBLIC ${OPENFPM_PDATA_DIR}/src)
 
 if (PETSC_FOUND)
 	target_include_directories(io PUBLIC ${PETSC_INCLUDES})