Commit a960ef26 authored by Jérémie Dudouet's avatar Jérémie Dudouet
Browse files

Merge branch 'preprod' into 'master'

Preprod->Master synchronization

See merge request !25
parents 51c5f63f 1971a678
Pipeline #21976 passed with stage
in 5 minutes and 19 seconds
......@@ -12,7 +12,13 @@ compile:
- mkdir gammaSoftware
- cd gammaSoftware
- git clone https://gitlab.in2p3.fr/IPNL_GAMMA/scripts.git
- mkdir LYON
- mkdir agaprodep
- cd agaprodep
- cp -r ../../gammaware/ .
- mv gammaware adf
- cd ..
- echo "Compilation of ADF..."
- python scripts/gRaySoftware.py --cmake="-DCMAKE_BUILD_TYPE=debug -- -j 4" --adf= conf compile install
- cd LYON
- cp -r ../../gammaware/ .
- mv gammaware gw
......
......@@ -24,7 +24,7 @@
#define ADF_PtrStack
#define ADF_PTRSTACK_H ADF_PtrStack
#include <Memory.h>
#include <memory.h>
namespace ADF
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment