Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit 04934a23 authored by TOUZE Francois's avatar TOUZE Francois
Browse files

fix for Linux version

parent a93f3eb3
...@@ -2,11 +2,11 @@ package aml ...@@ -2,11 +2,11 @@ package aml
macro aml_home "" \ macro aml_home "" \
Darwin "/Users/touze/Public/aml-uap.hg" \ Darwin "/Users/touze/Public/aml-uap.hg" \
Linux "/usr/local/accelerator-ml-code" Linux "/accelerator-ml-code"
macro aml_cppflags "" \ macro aml_cppflags "" \
Darwin " -I $(aml_home)" \ Darwin " -I $(aml_home)" \
Linux " -I $(aml_home) -I/usr/local/xerces-c-3.1.3/src/xercesc" Linux " -I $(aml_home) -I/xerces-c-3.2.2/src/xercesc"
macro aml_linkopts "" \ macro aml_linkopts "" \
Darwin " -L${aml_home}/lib/ -lantlr -luap -L/usr/local/lib -lxerces-c"\ Darwin " -L${aml_home}/lib/ -lantlr -luap -L/usr/local/lib -lxerces-c"\
......
package json package json
macro json_home "/usr/local/Cellar/nlohmann_json/3.1.2" macro json_home "" \
macro json_cppflags " -I/usr/local/include/nlohmann" Linux "/json" \
Darwin "/usr/local/Cellar/nlohmann_json/3.1.2"
macro json_cppflags "" \
Linux " -I/json/include" \
Darwin " -I/usr/local/include/nlohmann"
...@@ -4,10 +4,12 @@ use aml v0 ...@@ -4,10 +4,12 @@ use aml v0
use json v0 use json v0
macro cpp "" \ macro cpp "" \
Darwin "g++ -std=c++14" Darwin "g++ -std=c++14" \
Linux "g++ -std=c++11"
macro cppflags "" \ macro cppflags "" \
Darwin " -pipe -Wno-long-long -fPIC " Darwin " -pipe -Wno-long-long -fPIC " \
Linux " -pipe -Wno-long-long -fPIC "
macro pspa_cppflags " -w -I$(PSPAROOT)/src/KindOfElements -I$(PSPAROOT)/src/Core" macro pspa_cppflags " -w -I$(PSPAROOT)/src/KindOfElements -I$(PSPAROOT)/src/Core"
macro pspa_linkopts " -L$(PSPAROOT)/${CMTCONFIG} -lpspa" macro pspa_linkopts " -L$(PSPAROOT)/${CMTCONFIG} -lpspa"
......
#include <iostream> #include <iostream>
#include <iterator>
#include "BETAParser.h" #include "BETAParser.h"
using namespace std; using namespace std;
......
#include <iostream> #include <iostream>
#include <iomanip> // std::setw
#include "softwareAstra.h" #include "softwareAstra.h"
#include "generatorParticle.h" #include "generatorParticle.h"
......
#include <iostream>
#include <iomanip> // std::setw
#include "softwareBeta.h" #include "softwareBeta.h"
#include "dataManager.h" #include "dataManager.h"
...@@ -7,8 +9,6 @@ ...@@ -7,8 +9,6 @@
#include "mixedTools.h" #include "mixedTools.h"
#include "INIReader.h" #include "INIReader.h"
#include <iomanip> // std::setw
softwareBeta::softwareBeta() : abstractSoftware() softwareBeta::softwareBeta() : abstractSoftware()
{ {
INIReader reader("../../pspa_config.ini"); INIReader reader("../../pspa_config.ini");
......
#include <iostream> #include <iostream>
#include <iomanip> // std::setw
#include "softwareElegant.h" #include "softwareElegant.h"
#include "PhysicalConstants.h" #include "PhysicalConstants.h"
......
#include <iostream>
#include <iomanip> // std::setw
#include "softwareMadx.h" #include "softwareMadx.h"
#include "dataManager.h" #include "dataManager.h"
......
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