Minor fixes to get AliceO2 to build on Mac.

Data/MCTrack.cxx

@@ -118,6 +118,7 @@ Int_t MCTrack::getNumberOfPoints(DetectorId detId) const
   //   return 0;
   // }
   //
+  return 0;
 }
 
 void MCTrack::setNumberOfPoints(Int_t iDet, Int_t nPoints)

Generators/CMakeLists.txt

@@ -22,6 +22,8 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 set(LINK_DIRECTORIES
 ${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${Pythia6_LIBRARY_DIR}
+${PYTHIA8_LIBRARY_DIR}
 ${AlFa_DIR}/lib
 ${SIMPATH}/lib
 )

Generators/Pythia8Generator.cxx

@@ -12,7 +12,7 @@
 
 #include <math.h>
 #include "TROOT.h"
-#include "Pythia.h"
+#include "Pythia8/Pythia.h"
 #include "FairPrimaryGenerator.h"
 //#include "FairGenerator.h"
 
@@ -40,7 +40,17 @@ Bool_t Pythia8Generator::Init()
   fPythia.setRndmEnginePtr(fRandomEngine);
 
   cout<<"Beam Momentum "<<fMom<<endl;
-  fPythia.init(fId, 2212, 0., 0., fMom, 0., 0., 0.);
+  // Set arguments in Settings database.
+  fPythia.settings.mode("Beams:idA",  fId);
+  fPythia.settings.mode("Beams:idB",  2212);
+  fPythia.settings.mode("Beams:frameType",  3);
+  fPythia.settings.parm("Beams:pxA",    0.);
+  fPythia.settings.parm("Beams:pyA",    0.);
+  fPythia.settings.parm("Beams:pzA",    fMom);
+  fPythia.settings.parm("Beams:pxB",    0.);
+  fPythia.settings.parm("Beams:pyB",    0.);
+  fPythia.settings.parm("Beams:pzB",    0.);
+  fPythia.init();
   return kTRUE;
 }
 // -------------------------------------------------------------------------

Generators/Pythia8Generator.h

@@ -15,7 +15,7 @@
 
 #include "TROOT.h"
 #include "FairGenerator.h"
-#include "Pythia.h"
+#include "Pythia8/Pythia.h"
 #include "TRandom1.h"
 #include "TRandom3.h"
 

devices/aliceHLTwrapper/AliHLTDataTypes.h

@@ -1433,6 +1433,7 @@ extern "C" {
 
 }
 
+namespace std {}
 using namespace std;
 
 //////////////////////////////////////////////////////////////////////////

devices/aliceHLTwrapper/Component.cxx

@@ -305,7 +305,7 @@ int Component::process(vector<MessageFormat::BufferDesc_t>& dataArray,
         for (; ci != inputBlocks.end(); ci++) {
           AliHLTUInt8_t* pInputBufferStart = reinterpret_cast<AliHLTUInt8_t*>(ci->fPtr);
           AliHLTUInt8_t* pInputBufferEnd = pInputBufferStart + ci->fSize;
-          if (bValid = (pStart >= pInputBufferStart && pEnd <= pInputBufferEnd)) {
+          if ((bValid = (pStart >= pInputBufferStart && pEnd <= pInputBufferEnd))) {
             break;
           }
         }

devices/flp2epn-distributed/CMakeLists.txt

@@ -5,6 +5,7 @@ set(INCLUDE_DIRECTORIES
 set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
+  ${ZMQ_INCLUDE_DIR}
   ${FAIRROOT_INCLUDE_DIR}
   ${AlFa_DIR}/include
 )

devices/flp2epn-distributed/FLPSender.cxx

@@ -7,6 +7,7 @@
 
 #include <vector>
 #include <cstdint> // UINT64_MAX
+#include <cassert>
 
 #include <boost/thread.hpp>
 #include <boost/bind.hpp>
@@ -298,4 +299,5 @@ ptime FLPSender::GetProperty(const int key, const ptime default_, const int slot
     case OutputHeartbeat:
       return fOutputHeartbeat.at(slot);
   }
+  assert(false);
 }

devices/flp2epn-dynamic/CMakeLists.txt

@@ -6,6 +6,7 @@ set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
   ${FAIRROOT_INCLUDE_DIR}
+  ${ZMQ_INCLUDE_DIR}
 )
 
 include_directories(${INCLUDE_DIRECTORIES})

devices/flp2epn-dynamic/O2FLPex.cxx

@@ -14,6 +14,7 @@
 #include <boost/bind.hpp>
 #include <iostream>
 #include <sstream>
+#include <cassert>
 
 #include "O2FLPex.h"
 #include "FairMQLogger.h"
@@ -188,4 +189,5 @@ boost::posix_time::ptime O2FLPex::GetProperty(const int key, const boost::posix_
     case OutputHeartbeat:
       return fOutputHeartbeat.at(slot);
   }
+  assert(false);
 }

devices/flp2epn/CMakeLists.txt

@@ -6,6 +6,7 @@ set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
   ${FAIRROOT_INCLUDE_DIR}
+  ${ZMQ_INCLUDE_DIR}
   ${AlFa_DIR}/include
 )
 

devices/hough/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
+  ${ROOT_INCLUDE_DIR}
   ${ALIROOT}/include
   ${SIMPATH}/include/root
 )
@@ -9,6 +10,7 @@ include_directories(SYSTEM ${INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
   ${Boost_LIBRARY_DIRS}
+  ${ROOT_LIBRARY_DIR}
   ${ALIROOT}/lib
   ${SIMPATH}/lib/root
 )

devices/roundtrip/CMakeLists.txt

@@ -6,6 +6,7 @@ set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
   ${FAIRROOT_INCLUDE_DIR}
+  ${ZMQ_INCLUDE_DIR}
   ${AlFa_DIR}/include
 )
 

its/ContainerFactory.cxx

@@ -39,4 +39,5 @@ FairParSet* ContainerFactory::createContainer(FairContainer* c)
   //                          c->GetTitle(),c->getContext());
   //}
   // return p;
+  return 0;
 }

o2cdb/CMakeLists.txt

@@ -6,6 +6,7 @@ set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
   ${ROOT_INCLUDE_DIR}
+  ${FAIRROOT_INCLUDE_DIR}
 )
 
 include_directories(${INCLUDE_DIRECTORIES})

passive/PassiveContFact.cxx

@@ -71,5 +71,6 @@ FairParSet* PassiveContFact::createContainer(FairContainer* c)
   }
   return p;
 */
+  return 0;
 }
 

tpc/ContainerFactory.cxx

@@ -51,4 +51,5 @@ FairParSet* ContainerFactory::createContainer(FairContainer* c)
   }
   return p;
      */
+  return 0;
 }