Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorhristov <Peter.Hristov@cern.ch>
Thu, 10 Apr 2014 14:11:15 +0000 (16:11 +0200)
committerhristov <Peter.Hristov@cern.ch>
Thu, 10 Apr 2014 14:11:15 +0000 (16:11 +0200)
1  2 
MFT/CMakelibMFTbase.pkg
PWGJE/CMakelibPWGJE.pkg
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx

@@@ -31,8 -31,10 +31,10 @@@ string ( REPLACE ".cxx" ".h" HDRS "${SR
  
  set ( DHDR MFTbaseLinkDef.h)
  
 -set ( EINCLUDE  STRUCT RAW MUON STEER/STEER STEER/STEERBase)
 +set ( EINCLUDE  STRUCT RAW MUON STEER/STEER STEER/AOD STEER/STEERBase)
  
+ set ( EXPORT AliMFTAnalysisTools.h AliMFTConstants.h)
  if( ALICE_TARGET STREQUAL "win32gcc")
        
                set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lSTEER -lCDB -lSTEERBase )
Simple merge