checking bug

configure.sh

+#! /bin/sh
+rm -r build/*-download ; 
+rm -r build/*-build ;
+
+cmake -DCMAKE_INSTALL_PREFIX=/home/om/CbmRoot/cmake_cbmroot/install -DSIMPATH=/home/om/CbmRoot/fairsoft_apr21p2_root6/installation -DFAIRROOTPATH=/home/om/CbmRoot/fairroot_v18.6.7-fairsoft_apr21p2_root6 -S . -B build/

reco/KF/KF.cmake

@@ -2,135 +2,49 @@
 # the array .
 # The extension is already found.  Any number of sources could be listed here.
 
-Set(INCLUDE_DIRECTORIES
-${CBMBASE_DIR} 
-
-${CBMROOT_SOURCE_DIR}/reco/base
-
-${CBMDATA_DIR}
-${CBMDATA_DIR}/base
-${CBMDATA_DIR}/sts
-${CBMDATA_DIR}/mvd
-${CBMDATA_DIR}/much
-${CBMDATA_DIR}/trd
-${CBMDATA_DIR}/rich
-${CBMDATA_DIR}/tof
-${CBMDATA_DIR}/global
-
-${CBMROOT_SOURCE_DIR}/reco/KF
-${CBMROOT_SOURCE_DIR}/reco/KF/Interface
-${CBMROOT_SOURCE_DIR}/reco/KF/KFQA
-
-${CBMDETECTORBASE_DIR}/sts
-
-${CBMROOT_SOURCE_DIR}/mvd 
-
-${CBMDETECTORBASE_DIR}/much # TMP for tracker interface
-${CBMDETECTORBASE_DIR}/trd  # TMP for tracker interface
-${CBMDETECTORBASE_DIR}/tof  # TMP for tracker interface
-${CBMROOT_SOURCE_DIR}/sim/transport/steer # TMP for tracker interface
-${CBMROOT_SOURCE_DIR}/sim/transport/geosetup # TMP for tracker interface
-)
-
-Include_Directories( ${INCLUDE_DIRECTORIES})
-
-Set(SYSTEM_INCLUDE_DIRECTORIES
-  ${BASE_INCLUDE_DIRECTORIES} 
-)
-
-Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
-
-set(LINK_DIRECTORIES
-${FAIRROOT_LIBRARY_DIR}
-${ROOT_LIBRARY_DIR}
-${Boost_LIBRARY_DIRS}
-)
- 
-link_directories(BEFORE ${LINK_DIRECTORIES})
+set(INCLUDE_DIRECTORIES
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/Interface
+  )
 
 set(SRCS
-CbmKF.cxx 
-CbmKFFieldMath.cxx 
-CbmKFHit.cxx 
-CbmKFMaterial.cxx 
-CbmKFMath.cxx 
-CbmKFPixelMeasurement.cxx 
-CbmKFPrimaryVertexFinder.cxx 
-CbmKFSecondaryVertexFinder.cxx 
-CbmKFTrackInterface.cxx 
-CbmKFUMeasurement.cxx 
-CbmKFVertexInterface.cxx 
+  CbmKF.cxx 
+  CbmKFFieldMath.cxx 
+  CbmKFHit.cxx 
+  CbmKFMaterial.cxx 
+  CbmKFMath.cxx 
+  CbmKFPixelMeasurement.cxx 
+  CbmKFPrimaryVertexFinder.cxx 
+  CbmKFSecondaryVertexFinder.cxx 
+  CbmKFTrackInterface.cxx 
+  CbmKFUMeasurement.cxx 
+  CbmKFVertexInterface.cxx 
 
 #### Tracker interfaces (will be moved to core/detector/*) ################
-CbmTrackingDetectorInterfaceInit.cxx
+  CbmTrackingDetectorInterfaceInit.cxx
 ###########################################################################
 
-#Interface/CbmEcalTrackExtrapolationKF.cxx
-Interface/CbmKFStsHit.cxx 
-Interface/CbmKFTrack.cxx 
-Interface/CbmKFTrdHit.cxx 
-Interface/CbmKFTofHit.cxx 
-Interface/CbmPVFinderKF.cxx 
-Interface/CbmStsFitPerformanceTask.cxx 
-Interface/CbmStsKFTrackFitter.cxx 
-Interface/CbmStsKFSecondaryVertexFinder.cxx 
-Interface/CbmTrdTrackFitterKF.cxx 
-Interface/CbmTofTrackFitterKF.cxx 
-Interface/CbmGlobalTrackFitterKF.cxx
-# CbmKFParticle.cxx
-# CbmKFParticle_simd.cxx
-# CbmKFParticleInterface.cxx
-#KFQA/CbmKFTrErrMCPoints.cxx
-#KFQA/CbmKFTrackFitQa.cxx
-#KFQA/CbmKFTrackQa.cxx
-#KFQA/KFParticleMatch.cxx
-#CbmKFParticleFinder.cxx
-#CbmKFParticleFinderPID.cxx
-#CbmKFParticleFinderQa.cxx
-#CbmKFParticleInterface.cxx
-)
-
-
-set(HEADERS
-CbmKF.h 
-CbmKFFieldMath.h
-CbmKFHit.h
-CbmKFMaterial.h
-CbmKFMath.h
-CbmKFPixelMeasurement.h
-CbmKFPrimaryVertexFinder.h
-CbmKFSecondaryVertexFinder.h
-CbmKFTrackInterface.h
-CbmKFUMeasurement.h 
-CbmKFVertexInterface.h
-
-#### Tracker interfaces (will be moved to core/detector/*) ################
-CbmTrackingDetectorInterfaceInit.h
-###########################################################################
+  #Interface/CbmEcalTrackExtrapolationKF.cxx
+  Interface/CbmKFStsHit.cxx 
+  Interface/CbmKFTrack.cxx 
+  Interface/CbmKFTrdHit.cxx 
+  Interface/CbmKFTofHit.cxx 
+  Interface/CbmPVFinderKF.cxx 
+  Interface/CbmStsFitPerformanceTask.cxx 
+  Interface/CbmStsKFTrackFitter.cxx 
+  Interface/CbmStsKFSecondaryVertexFinder.cxx 
+  Interface/CbmTrdTrackFitterKF.cxx 
+  Interface/CbmTofTrackFitterKF.cxx 
+  Interface/CbmGlobalTrackFitterKF.cxx
+  # CbmKFParticle.cxx
+  # CbmKFParticle_simd.cxx
+  # CbmKFParticleInterface.cxx
+  #CbmKFParticleFinder.cxx
+  #CbmKFParticleFinderPID.cxx
+  #CbmKFParticleFinderQa.cxx
+  #CbmKFParticleInterface.cxx
+  )
 
-#Interface/CbmEcalTrackExtrapolationKF.h
-Interface/CbmKFStsHit.h
-Interface/CbmKFTrack.h 
-Interface/CbmKFTrdHit.h 
-Interface/CbmKFTofHit.h 
-Interface/CbmPVFinderKF.h
-Interface/CbmStsFitPerformanceTask.h
-Interface/CbmStsKFTrackFitter.h
-Interface/CbmStsKFSecondaryVertexFinder.h
-Interface/CbmTrdTrackFitterKF.h
-Interface/CbmTofTrackFitterKF.h
-Interface/CbmGlobalTrackFitterKF.h
-# CbmKFParticle.h
-#KFQA/CbmKFTrErrMCPoints.h
-#KFQA/CbmKFTrackFitQa.h
-#KFQA/CbmKFTrackQa.h
-#KFQA/CbmKFPartEfficiencies.h
-#KFQA/KFParticleMatch.h
-#CbmKFParticleFinder.h
-#CbmKFParticleFinderPID.h
-#CbmKFParticleFinderQa.h
-#CbmKFParticleInterface.h
-)
 
 If(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   ADD_DEFINITIONS(-Wall -Wsign-promo -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wno-parentheses -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast   : wait for other parts of cbmroot\root.
@@ -166,14 +80,42 @@ ELSE (SSE_FOUND)
   "-O3")
 ENDIF (SSE_FOUND)
 
-set(LINKDEF KFLinkDef.h)
-Set(LIBRARY_NAME KF)
-Set(DEPENDENCIES
-  CbmRecoBase CbmSimSteer CbmStsBase CbmMvd CbmMuchBase CbmTrdBase CbmTofBase CbmBase CbmData Base Minuit2
-)
+
+set(LIBRARY_NAME KF)
+set(LINKDEF ${LIBRARY_NAME}LinkDef.h)
+set(PUBLIC_DEPENDENCIES
+  CbmBase
+  CbmData
+  CbmMvd
+  CbmRecoBase
+  FairRoot::Base
+  ROOT::Core
+  ROOT::Geom
+  ROOT::Hist
+  )
+
+set(PRIVATE_DEPENDENCIES
+  CbmMuchBase
+  CbmSimSteer
+  CbmStsBase
+  CbmTofBase
+  CbmTrdBase
+  FairLogger::FairLogger
+  FairRoot::GeoBase
+  FairRoot::ParBase
+  ROOT::EG
+  ROOT::Gpad
+  ROOT::MathCore
+  ROOT::Matrix
+  ROOT::Physics
+  ROOT::RIO
+  ROOT::Tree
+  )
+
 Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
 
-GENERATE_LIBRARY()
+generate_cbm_library()
 
-Install(FILES Interface/CbmKFVertex.h
-        DESTINATION include)
+install(FILES Interface/CbmKFVertex.h
+        DESTINATION include
+       )

reco/KF/KFParticleInterface.cmake

@@ -2,115 +2,80 @@
 # the array .
 # The extension is already found.  Any number of sources could be listed here.
 
-Set(INCLUDE_DIRECTORIES
-  ${CBMBASE_DIR}
-
-  ${CBMROOT_SOURCE_DIR}/reco/base
-
-  ${CBMDATA_DIR}
-  ${CBMDATA_DIR}/base
-  ${CBMDATA_DIR}/sts
-  ${CBMDATA_DIR}/mvd
-  ${CBMDATA_DIR}/much
-  ${CBMDATA_DIR}/trd
-  ${CBMDATA_DIR}/rich
-  ${CBMDATA_DIR}/tof
-  ${CBMDATA_DIR}/global
-
-  ${CBMROOT_SOURCE_DIR}/reco/KF
-  ${CBMROOT_SOURCE_DIR}/reco/KF/Interface
-  ${CBMROOT_SOURCE_DIR}/reco/KF/KFQA
-
-  ${CBMDETECTORBASE_DIR}/sts
-
-  ${CBMROOT_SOURCE_DIR}/reco/L1
-  ${CBMROOT_SOURCE_DIR}/reco/L1/L1Algo
-
-  # ${CBMROOT_SOURCE_DIR}/reco/L1/ParticleFinder
-  ${CBMROOT_SOURCE_DIR}/mvd
-)
-
-Include_Directories(${INCLUDE_DIRECTORIES})
-
-Set(SYSTEM_INCLUDE_DIRECTORIES
-  # ${KFParticle_INCLUDE_DIR}
-  ${BASE_INCLUDE_DIRECTORIES}
-)
-
-Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
-
-set(LINK_DIRECTORIES
-  # ${KFParticle_LIB_DIR}
-  ${FAIRROOT_LIBRARY_DIR}
-  ${ROOT_LIBRARY_DIR}
-  ${Boost_LIBRARY_DIRS}
-)
-
-link_directories(BEFORE ${LINK_DIRECTORIES})
+set(INCLUDE_DIRECTORIES
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  )
 
 set(SRCS
-  CbmKFParticleFinder.cxx
-  CbmKFParticleFinderPID.cxx
-  CbmKFParticleFinderQa.cxx
-  CbmKFParticleInterface.cxx
-)
-
-set(HEADERS
-  CbmKFParticleFinder.h
-  CbmKFParticleFinderPID.h
-  CbmKFParticleFinderQa.h
-  CbmKFParticleInterface.h
+CbmKFParticleFinder.cxx
+CbmKFParticleFinderPID.cxx
+CbmKFParticleFinderQa.cxx
+CbmKFParticleInterface.cxx
 )
 
 If(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   ADD_DEFINITIONS(-Wall -Wsign-promo -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wno-parentheses -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast   : wait for other parts of cbmroot\root.
-
-  # ---Check for compiler flags
+  #---Check for compiler flags
   CHECK_CXX_COMPILER_FLAG("-Werror -Wno-pmf-conversions" HAS_PMF)
-
   If(HAS_PMF)
     ADD_DEFINITIONS(-Wno-pmf-conversions)
   EndIf()
-
   CHECK_CXX_COMPILER_FLAG("-Werror -Wstrict-null-sentinel" HAS_SENTINEL)
-
   If(HAS_SENTINEL)
     ADD_DEFINITIONS(-Wstrict-null-sentinel)
   EndIf()
-
   CHECK_CXX_COMPILER_FLAG("-Werror -Wno-non-template-friend" HAS_TEMPLATE_FRIEND)
-
   If(HAS_TEMPLATE_FRIEND)
     ADD_DEFINITIONS(-Wno-non-template-friend)
   EndIf()
-
   CHECK_CXX_COMPILER_FLAG("-Werror -Wno-pragmas" HAS_PRAGMA)
-
   If(HAS_PRAGMA)
     ADD_DEFINITIONS(-Wno-pragmas)
   EndIf()
 Else()
-  ADD_DEFINITIONS(-Wall -Wsign-promo -Wno-pmf-conversions -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wstrict-null-sentinel -Wno-non-template-friend -Wno-pragmas -Wno-parentheses -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast   : wait for other parts of cbmroot\root.
+  ADD_DEFINITIONS(-Wall -Wsign-promo  -Wno-pmf-conversions -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wstrict-null-sentinel -Wno-non-template-friend -Wno-pragmas -Wno-parentheses -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast   : wait for other parts of cbmroot\root.
 EndIf()
 
-IF(SSE_FOUND)
+IF (SSE_FOUND)
   Message(STATUS "KFParticleInterface will be compiled with SSE support")
   ADD_DEFINITIONS(-DHAVE_SSE)
-  SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS
-    "-msse -O3")
-ELSE(SSE_FOUND)
+  SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS 
+  "-msse -O3")
+ELSE (SSE_FOUND)
   MESSAGE(STATUS "KFParticleInterface will be compiled without SSE support")
-  SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS
-    "-O3")
-ENDIF(SSE_FOUND)
+  SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS 
+  "-O3")
+ENDIF (SSE_FOUND)
+
 
-set(LINKDEF KFParticleInterfaceLinkDef.h)
 Set(LIBRARY_NAME KFParticleInterface)
-Set(DEPENDENCIES
-  KF KFQA KFParticle L1
-)
+set(LINKDEF ${LIBRARY_NAME}LinkDef.h)
+set(PUBLIC_DEPENDENCIES
+  CbmData
+  KF
+  FairRoot::Base  
+  ROOT::Core
+  ROOT::Hist
+  )
+
+set(PRIVATE_DEPENDENCIES
+  CbmStsBase
+  KFQA
+  KFParticle
+  L1
+  FairLogger::FairLogger
+  ROOT::EG
+  ROOT::MathCore
+  ROOT::Matrix
+  ROOT::Physics
+  )
+
+set(INTERFACE_DEPENDENCIES
+  CbmRecoBase
+  )
+
 Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
 
-GENERATE_LIBRARY()
+generate_cbm_library()
 
 Add_Dependencies(KFParticleInterface KFPARTICLE)

reco/KF/KFQA.cmake

@@ -2,67 +2,22 @@
 # the array .
 # The extension is already found.  Any number of sources could be listed here.
 
-Set(INCLUDE_DIRECTORIES
-${CBMBASE_DIR} 
-
-${CBMROOT_SOURCE_DIR}/reco/base
-
-${CBMDATA_DIR}
-${CBMDATA_DIR}/base
-${CBMDATA_DIR}/sts
-${CBMDATA_DIR}/mvd
-${CBMDATA_DIR}/much
-${CBMDATA_DIR}/trd
-${CBMDATA_DIR}/rich
-${CBMDATA_DIR}/tof
-${CBMDATA_DIR}/global
-
-${CBMROOT_SOURCE_DIR}/reco/KF
-${CBMROOT_SOURCE_DIR}/reco/KF/Interface
-${CBMROOT_SOURCE_DIR}/reco/KF/KFQA
-
-${CBMDETECTORBASE_DIR}/sts
-
-${CBMROOT_SOURCE_DIR}/reco/L1
-${CBMROOT_SOURCE_DIR}/reco/L1/L1Algo
-${CBMROOT_SOURCE_DIR}/reco/L1/ParticleFinder
-
-${CBMROOT_SOURCE_DIR}/mvd 
-)
-
-Include_Directories( ${INCLUDE_DIRECTORIES})
-
-Set(SYSTEM_INCLUDE_DIRECTORIES
-  ${KFParticle_INCLUDE_DIR}
-  ${BASE_INCLUDE_DIRECTORIES} 
-)
-
-Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
-
-set(LINK_DIRECTORIES
-${KFParticle_LIB_DIR}
-${FAIRROOT_LIBRARY_DIR}
-${ROOT_LIBRARY_DIR}
-${Boost_LIBRARY_DIRS}
-)
- 
-link_directories(BEFORE ${LINK_DIRECTORIES})
+set(INCLUDE_DIRECTORIES
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/KFQA
+  )
 
 set(SRCS
-KFQA/CbmKFTrErrMCPoints.cxx
-KFQA/CbmKFTrackFitQa.cxx
-KFQA/CbmKFTrackQa.cxx
-KFQA/KFParticleMatch.cxx
-)
+  KFQA/CbmKFTrErrMCPoints.cxx
+  KFQA/CbmKFTrackFitQa.cxx
+  KFQA/CbmKFTrackQa.cxx
+  KFQA/KFParticleMatch.cxx
+  )
 
 
 set(HEADERS
-KFQA/CbmKFTrErrMCPoints.h
-KFQA/CbmKFTrackFitQa.h
-KFQA/CbmKFTrackQa.h
-KFQA/CbmKFPartEfficiencies.h
-KFQA/KFParticleMatch.h
-)
+  KFQA/CbmKFPartEfficiencies.h
+  )
 
 If(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   ADD_DEFINITIONS(-Wall -Wsign-promo -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wno-parentheses -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast   : wait for other parts of cbmroot\root.
@@ -98,17 +53,35 @@ ELSE (SSE_FOUND)
   "-O3")
 ENDIF (SSE_FOUND)
 
-set(LINKDEF KFQALinkDef.h)
-Set(LIBRARY_NAME KFQA)
-Set(DEPENDENCIES
-    KF L1 KFParticle
-)
+
+set(LIBRARY_NAME KFQA)
+set(LINKDEF ${LIBRARY_NAME}LinkDef.h)
+set(PUBLIC_DEPENDENCIES
+  CbmData
+  KF
+  L1
+  FairRoot::Base
+  ROOT::Core
+  ROOT::Hist
+  )
+
+set(PRIVATE_DEPENDENCIES
+  CbmBase
+  CbmStsBase
+  KFParticle
+  ROOT::EG
+  ROOT::MathCore
+  ROOT::RIO
+  ROOT::Tree
+  )
+
+
 
 Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
 
-GENERATE_LIBRARY()
+generate_cbm_library()
 
-Add_Dependencies(KFQA KFPARTICLE)
-Install(FILES KFQA/CbmKFTrErrMCPoints.h
+install(FILES KFQA/CbmKFTrErrMCPoints.h
               KFQA/CbmKFPartEfficiencies.h
-        DESTINATION include/KF/KFQA)
+        DESTINATION include/KF/KFQA
+       )