From 545a173b421a6e4287a9977b0d09a0a207bcac8b Mon Sep 17 00:00:00 2001 From: Florian Uhlig <florian.uhlig@googlemail.com> Date: Wed, 8 Sep 2021 09:27:32 +0000 Subject: [PATCH] Correct order of link directories Somehow (at least on some systems) the link order was such that the first directory was $SIMPATH/lib. This was even the case when the order was defined differently in the CMakeLists.txt. The problem isn't yet understood completely. This results in the problem that libVc.a was taken from $SIMPATH/lib were it is installed by ROOT/FairSoft. As long as the version provided with CbmRoot and the version provided by ROOT were the same the problem wasn't seen. When updating our internal Vc version this results in a creash when loading libryries due to a version mismatch between the library version and the header file version. --- MQ/mcbm/CMakeLists.txt | 5 ++--- analysis/PWGC2F/femtoscopy/nicafemto/CMakeLists.txt | 1 - .../PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt | 5 ++--- .../PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt | 7 +++---- .../femtoscopy/nicafemto/helpers/CMakeLists.txt | 5 ++--- analysis/PWGCHA/jpsi/CMakeLists.txt | 8 +++----- analysis/PWGDIL/dielectron/conversion/CMakeLists.txt | 6 ++---- analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt | 6 ++---- .../PWGDIL/dielectron/papaframework/CMakeLists.txt | 8 +++----- .../dielectron/papaframework/fastsim/CMakeLists.txt | 5 ++--- analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt | 10 ++++------ analysis/PWGDIL/dimuon/CMakeLists.txt | 5 ++--- analysis/PWGHAD/hadron/CMakeLists.txt | 5 ++--- .../common/analysis_tree_converter/CMakeLists.txt | 11 +++++------ analysis/common/at_kfpf_interface/CMakeLists.txt | 11 ++++------- core/detectors/trd/CMakeLists.txt | 4 +--- external/InstallVC.cmake | 4 ++-- reco/KF/CMakeLists.txt | 4 ++-- reco/L1/CMakeLists.txt | 4 +--- reco/base/CMakeLists.txt | 2 +- reco/detectors/rich/CMakeLists.txt | 5 ++--- reco/detectors/rich/qa/mirrors/CMakeLists.txt | 3 +-- reco/eventbuilder/CMakeLists.txt | 5 ++--- reco/global/CMakeLists.txt | 5 ++--- reco/littrack/CMakeLists.txt | 5 ++--- reco/qa/CMakeLists.txt | 1 - reco/steer/CMakeLists.txt | 4 ++-- reco/tracking/global/CMakeLists.txt | 5 ++--- reco/tracking/vector/CMakeLists.txt | 2 -- sim/detectors/trd/CMakeLists.txt | 4 +--- sim/transport/geosetup/CMakeLists.txt | 4 +--- sim/transport/steer/CMakeLists.txt | 4 +--- 32 files changed, 61 insertions(+), 102 deletions(-) diff --git a/MQ/mcbm/CMakeLists.txt b/MQ/mcbm/CMakeLists.txt index 142c438608..6671f55ab5 100644 --- a/MQ/mcbm/CMakeLists.txt +++ b/MQ/mcbm/CMakeLists.txt @@ -46,11 +46,10 @@ include_directories(${INCLUDE_DIRECTORIES}) include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES - ${Vc_LIB_DIR} - ${ROOT_LIBRARY_DIR} - ${FAIRROOT_LIBRARY_DIR} ${KFParticle_LIB_DIR} ${FAIRMQ_LIBRARY_DIR} + ${FAIRROOT_LIBRARY_DIR} + ${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} ) diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/CMakeLists.txt b/analysis/PWGC2F/femtoscopy/nicafemto/CMakeLists.txt index 53efc9d7f8..ae254d76ed 100644 --- a/analysis/PWGC2F/femtoscopy/nicafemto/CMakeLists.txt +++ b/analysis/PWGC2F/femtoscopy/nicafemto/CMakeLists.txt @@ -9,7 +9,6 @@ set(KF_HEADERS ${CBMROOT_SOURCE_DIR}/L1/ParticleFinder ${CLHEP_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} - ${VC_INCLUDE_DIRS} ${KFParticle_INCLUDE_DIR} ${CBMROOT_SOURCE_DIR}/KF ${CBMROOT_SOURCE_DIR}/KF/Interface diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt index 85ee30f4d5..68cb30bb7a 100644 --- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt +++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt @@ -22,11 +22,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES ) Set(LINK_DIRECTORIES - ${ROOT_LIBRARY_DIR} + ${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} + ${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} - ${Vc_LIB_DIR} - ${KFParticle_LIB_DIR} ) Include_Directories(${INCLUDE_DIRECTORIES}) diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt b/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt index 18c3372410..ff78d2a8df 100644 --- a/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt +++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt @@ -21,12 +21,11 @@ Set(SYSTEM_INCLUDE_DIRECTORIES ) Set(LINK_DIRECTORIES - ${ROOT_LIBRARY_DIR} - ${FAIRROOT_LIBRARY_DIR} - ${Boost_LIBRARY_DIRS} - ${Vc_LIB_DIR} ${KFParticle_LIB_DIR} ${AnalysisTree_LIBRARY_DIR} + ${FAIRROOT_LIBRARY_DIR} + ${ROOT_LIBRARY_DIR} + ${Boost_LIBRARY_DIRS} ) Include_Directories(${INCLUDE_DIRECTORIES}) diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt index c93514cbf4..67598ce8c5 100644 --- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt +++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt @@ -20,11 +20,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES ) Set(LINK_DIRECTORIES - ${ROOT_LIBRARY_DIR} + ${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} + ${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} - ${Vc_LIB_DIR} - ${KFParticle_LIB_DIR} ) Include_Directories(${INCLUDE_DIRECTORIES}) diff --git a/analysis/PWGCHA/jpsi/CMakeLists.txt b/analysis/PWGCHA/jpsi/CMakeLists.txt index ac46855dd7..f60e7e1fbe 100644 --- a/analysis/PWGCHA/jpsi/CMakeLists.txt +++ b/analysis/PWGCHA/jpsi/CMakeLists.txt @@ -31,17 +31,15 @@ Include_Directories( ${INCLUDE_DIRECTORIES}) Set(SYSTEM_INCLUDE_DIRECTORIES ${BASE_INCLUDE_DIRECTORIES} ${Boost_INCLUDE_DIR} - ${VC_INCLUDE_DIRS} ) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} +${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} ) link_directories( ${LINK_DIRECTORIES}) @@ -72,7 +70,7 @@ ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -D Set(LINKDEF CbmJPsiAnalysisLinkDef.h) Set(LIBRARY_NAME CbmJPsiAnalysis) -Set(DEPENDENCIES KF L1 CbmRichReco CbmRichBase CbmBase CbmData Littrack Vc.a) +Set(DEPENDENCIES KF L1 CbmRichReco CbmRichBase CbmBase CbmData Littrack) Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS) GENERATE_LIBRARY() diff --git a/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt b/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt index a5cc6297a9..f6efb53ed7 100644 --- a/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt +++ b/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt @@ -29,7 +29,6 @@ ${CBMROOT_SOURCE_DIR}/reco/detectors/rich/utils Include_Directories( ${INCLUDE_DIRECTORIES}) Set(SYSTEM_INCLUDE_DIRECTORIES - ${VC_INCLUDE_DIRS} ${BASE_INCLUDE_DIRECTORIES} ${Boost_INCLUDE_DIR} ${KFParticle_INCLUDE_DIR} @@ -38,10 +37,9 @@ Set(SYSTEM_INCLUDE_DIRECTORIES Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${Vc_LIB_DIR} ${KFParticle_LIB_DIR} -${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} ) @@ -75,7 +73,7 @@ ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -D Set(LINKDEF CbmConversionAnalysisLinkDef.h) Set(LIBRARY_NAME CbmConversionAnalysis) -Set(DEPENDENCIES KF L1 CbmRichReco CbmRichBase CbmRecoBase CbmData Littrack Vc.a) +Set(DEPENDENCIES KF L1 CbmRichReco CbmRichBase CbmRecoBase CbmData Littrack) Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS) GENERATE_LIBRARY() diff --git a/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt b/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt index 7ec28d9e68..5ecd75cdc0 100644 --- a/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt +++ b/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt @@ -33,17 +33,15 @@ Include_Directories( ${INCLUDE_DIRECTORIES}) Set(SYSTEM_INCLUDE_DIRECTORIES ${BASE_INCLUDE_DIRECTORIES} ${Boost_INCLUDE_DIR} - ${VC_INCLUDE_DIRS} ) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} +${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt index 7112ea3942..6b139f3be8 100644 --- a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt +++ b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt @@ -49,17 +49,15 @@ Include_Directories( ${INCLUDE_DIRECTORIES}) Set(SYSTEM_INCLUDE_DIRECTORIES ${BASE_INCLUDE_DIRECTORIES} ${Boost_INCLUDE_DIR} - ${VC_INCLUDE_DIRS} ) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} +${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} ) #Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wshadow -Weffc++ -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-ignored-qualifiers -Wno-overloaded-virtual") @@ -147,7 +145,7 @@ EndIf() Set(LINKDEF CbmPapaLinkDef.h) Set(LIBRARY_NAME CbmPapa) Set(DEPENDENCIES - L1 KF Littrack CbmRichReco CbmRichBase CbmBase CbmData CbmSimGenerators Base Vc.a) + L1 KF Littrack CbmRichReco CbmRichBase CbmBase CbmData CbmSimGenerators Base) GENERATE_LIBRARY() diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CMakeLists.txt b/analysis/PWGDIL/dielectron/papaframework/fastsim/CMakeLists.txt index 443e972086..bc48b0bdc2 100644 --- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CMakeLists.txt +++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CMakeLists.txt @@ -12,14 +12,13 @@ Include_Directories( ${INCLUDE_DIRECTORIES}) Set(SYSTEM_INCLUDE_DIRECTORIES ${BASE_INCLUDE_DIRECTORIES} ${Boost_INCLUDE_DIR} - ${VC_INCLUDE_DIRS} ) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} ) @@ -38,7 +37,7 @@ Set(HEADERS ) Set(LINKDEF CbmFastSimLinkDef.h) Set(LIBRARY_NAME CbmFastSim) Set(DEPENDENCIES - CbmPapa CbmBase CbmData CbmSimGenerators Base VMC Vc.a + CbmPapa CbmBase CbmData CbmSimGenerators Base VMC ) GENERATE_LIBRARY() diff --git a/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt b/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt index fcc883df5b..33cf2f1406 100644 --- a/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt +++ b/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt @@ -31,20 +31,18 @@ ${CBMROOT_SOURCE_DIR}/reco/detectors/rich/utils Include_Directories( ${INCLUDE_DIRECTORIES}) Set(SYSTEM_INCLUDE_DIRECTORIES + ${KFParticle_INCLUDE_DIR} ${BASE_INCLUDE_DIRECTORIES} ${Boost_INCLUDE_DIR} - ${VC_INCLUDE_DIRS} - ${KFParticle_INCLUDE_DIR} ) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} +${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} ) link_directories( ${LINK_DIRECTORIES}) @@ -89,7 +87,7 @@ ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -D Set(LINKDEF CbmConversion2AnalysisLinkDef.h) Set(LIBRARY_NAME CbmConversion2Analysis) -Set(DEPENDENCIES KF L1 CbmRichBase CbmRichReco CbmRecoBase CbmData Vc.a) +Set(DEPENDENCIES KF L1 CbmRichBase CbmRichReco CbmRecoBase CbmData) Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS) GENERATE_LIBRARY() diff --git a/analysis/PWGDIL/dimuon/CMakeLists.txt b/analysis/PWGDIL/dimuon/CMakeLists.txt index d779771241..cbeb15e577 100644 --- a/analysis/PWGDIL/dimuon/CMakeLists.txt +++ b/analysis/PWGDIL/dimuon/CMakeLists.txt @@ -28,11 +28,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} +${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/analysis/PWGHAD/hadron/CMakeLists.txt b/analysis/PWGHAD/hadron/CMakeLists.txt index 498f195731..8337fe7c37 100644 --- a/analysis/PWGHAD/hadron/CMakeLists.txt +++ b/analysis/PWGHAD/hadron/CMakeLists.txt @@ -32,11 +32,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} +${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/analysis/common/analysis_tree_converter/CMakeLists.txt b/analysis/common/analysis_tree_converter/CMakeLists.txt index a4b18142c2..8783ee8728 100644 --- a/analysis/common/analysis_tree_converter/CMakeLists.txt +++ b/analysis/common/analysis_tree_converter/CMakeLists.txt @@ -45,7 +45,6 @@ Set(INCLUDE_DIRECTORIES Include_Directories (${INCLUDE_DIRECTORIES}) Set(SYSTEM_INCLUDE_DIRECTORIES - ${VC_INCLUDE_DIRS} ${BASE_INCLUDE_DIRECTORIES} ${Boost_INCLUDE_DIR} ) @@ -53,12 +52,11 @@ Set(SYSTEM_INCLUDE_DIRECTORIES Include_Directories (SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set (LINK_DIRECTORIES - ${ROOT_LIBRARY_DIR} + ${AnalysisTree_LIBRARY_DIR} + ${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} + ${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} - ${Vc_LIB_DIR} - ${KFParticle_LIB_DIR} - ${AnalysisTree_LIBRARY_DIR} ) link_directories(${LINK_DIRECTORIES}) @@ -83,7 +81,8 @@ Set(DEPENDENCIES KF L1 CbmSimGenerators - Vc.a) +) + Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS) ADD_DEFINITIONS(${DEFINITIONS}) diff --git a/analysis/common/at_kfpf_interface/CMakeLists.txt b/analysis/common/at_kfpf_interface/CMakeLists.txt index 6f21eab0bf..572a1bb442 100644 --- a/analysis/common/at_kfpf_interface/CMakeLists.txt +++ b/analysis/common/at_kfpf_interface/CMakeLists.txt @@ -15,7 +15,6 @@ Set(INCLUDE_DIRECTORIES Include_Directories (${INCLUDE_DIRECTORIES}) Set(SYSTEM_INCLUDE_DIRECTORIES - ${VC_INCLUDE_DIRS} ${BASE_INCLUDE_DIRECTORIES} ${Boost_INCLUDE_DIR} ) @@ -23,12 +22,11 @@ Set(SYSTEM_INCLUDE_DIRECTORIES Include_Directories (SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set (LINK_DIRECTORIES - ${ROOT_LIBRARY_DIR} + ${AnalysisTree_LIBRARY_DIR} + ${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} + ${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} - ${Vc_LIB_DIR} - ${KFParticle_LIB_DIR} - ${AnalysisTree_LIBRARY_DIR} ) link_directories(${LINK_DIRECTORIES}) @@ -48,8 +46,7 @@ Set(_AnalysisTree_LIB AnalysisTreeBase AnalysisTreeInfra) Set(DEPENDENCIES ${_AnalysisTree_LIB} - KFParticle - Vc.a) + KFParticle) Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS) ADD_DEFINITIONS(${DEFINITIONS}) diff --git a/core/detectors/trd/CMakeLists.txt b/core/detectors/trd/CMakeLists.txt index e4e8f8886e..dd93503742 100644 --- a/core/detectors/trd/CMakeLists.txt +++ b/core/detectors/trd/CMakeLists.txt @@ -13,16 +13,14 @@ Include_Directories( ${INCLUDE_DIRECTORIES}) Set(SYSTEM_INCLUDE_DIRECTORIES ${BASE_INCLUDE_DIRECTORIES} - ${Boost_INCLUDE_DIR} ) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/external/InstallVC.cmake b/external/InstallVC.cmake index af4399be6d..03ca1a1456 100644 --- a/external/InstallVC.cmake +++ b/external/InstallVC.cmake @@ -7,8 +7,8 @@ set(Vc_ROOTDIR "${Vc_DESTDIR}/${CMAKE_BINARY_DIR}") set(Vc_LIBNAME "${CMAKE_STATIC_LIBRARY_PREFIX}Vc${CMAKE_STATIC_LIBRARY_SUFFIX}") set(Vc_LIBRARY "${Vc_ROOTDIR}/${_LIBDIR_DEFAULT}/${Vc_LIBNAME}") -set(Vc_VERSION f8a18751dcb001c8d9820a6c90a1f605e27ca692) # Hash for tag 1.4.1, Need hash for tests -#set(Vc_VERSION fc2d75d0f23f33c2224d546acb965c535a45454a) # Hash for tag 1.4.2, Need hash for tests +#set(Vc_VERSION f8a18751dcb001c8d9820a6c90a1f605e27ca692) # Hash for tag 1.4.1, Need hash for tests +set(Vc_VERSION fc2d75d0f23f33c2224d546acb965c535a45454a) # Hash for tag 1.4.2, Need hash for tests set(Vc_SRC_URL "https://github.com/VcDevel/Vc") download_project_if_needed(PROJECT vc_source diff --git a/reco/KF/CMakeLists.txt b/reco/KF/CMakeLists.txt index b57a8a25cd..da9d382369 100644 --- a/reco/KF/CMakeLists.txt +++ b/reco/KF/CMakeLists.txt @@ -43,12 +43,12 @@ Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES ${Vc_LIB_DIR} ${KFParticle_LIB_DIR} -${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} ) -link_directories( ${LINK_DIRECTORIES}) +link_directories(BEFORE ${LINK_DIRECTORIES}) set(SRCS CbmKF.cxx diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt index b9a745afa3..dc4a135e20 100644 --- a/reco/L1/CMakeLists.txt +++ b/reco/L1/CMakeLists.txt @@ -63,7 +63,6 @@ ${CBMROOT_SOURCE_DIR}/mvd Include_Directories( ${INCLUDE_DIRECTORIES}) Set(SYSTEM_INCLUDE_DIRECTORIES - ${VC_INCLUDE_DIRS} ${BASE_INCLUDE_DIRECTORIES} ${KFParticle_INCLUDE_DIR} ) @@ -80,10 +79,9 @@ endif() Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${Vc_LIB_DIR} ${KFParticle_LIB_DIR} -${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} ) diff --git a/reco/base/CMakeLists.txt b/reco/base/CMakeLists.txt index fc222c674b..befd16ee00 100644 --- a/reco/base/CMakeLists.txt +++ b/reco/base/CMakeLists.txt @@ -55,8 +55,8 @@ ${IPC_INCLUDE_DIRECTORY} # ---- Link directories ---------------------------------- set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} ) # --------------------------------------------------------- diff --git a/reco/detectors/rich/CMakeLists.txt b/reco/detectors/rich/CMakeLists.txt index a1d2c7b217..16bdb2b215 100644 --- a/reco/detectors/rich/CMakeLists.txt +++ b/reco/detectors/rich/CMakeLists.txt @@ -54,11 +54,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} +${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/reco/detectors/rich/qa/mirrors/CMakeLists.txt b/reco/detectors/rich/qa/mirrors/CMakeLists.txt index fd58853ee8..04ae8facac 100644 --- a/reco/detectors/rich/qa/mirrors/CMakeLists.txt +++ b/reco/detectors/rich/qa/mirrors/CMakeLists.txt @@ -26,10 +26,9 @@ Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) get_filename_component(TIFF_LIBRARY_DIR ${TIFF_LIBRARY} DIRECTORY) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} ${TIFF_LIBRARY_DIR} ) diff --git a/reco/eventbuilder/CMakeLists.txt b/reco/eventbuilder/CMakeLists.txt index 9473646a6d..6f713d1f91 100644 --- a/reco/eventbuilder/CMakeLists.txt +++ b/reco/eventbuilder/CMakeLists.txt @@ -48,18 +48,17 @@ ${CBMROOT_SOURCE_DIR}/core/data/raw Include_Directories( ${INCLUDE_DIRECTORIES}) set(SYSTEM_INCLUDE_DIRECTORIES - ${VC_INCLUDE_DIRS} ${KFParticle_INCLUDE_DIR} ${BASE_INCLUDE_DIRECTORIES} ) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) + set(LINK_DIRECTORIES -${Vc_LIB_DIR} ${KFParticle_LIB_DIR} -${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} ) diff --git a/reco/global/CMakeLists.txt b/reco/global/CMakeLists.txt index faa112fda0..f4a1470d6b 100644 --- a/reco/global/CMakeLists.txt +++ b/reco/global/CMakeLists.txt @@ -26,11 +26,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} +${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/reco/littrack/CMakeLists.txt b/reco/littrack/CMakeLists.txt index 10d92ac4cc..18e945027e 100644 --- a/reco/littrack/CMakeLists.txt +++ b/reco/littrack/CMakeLists.txt @@ -64,11 +64,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} +${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/reco/qa/CMakeLists.txt b/reco/qa/CMakeLists.txt index 4b237c1c51..8fb6c18950 100644 --- a/reco/qa/CMakeLists.txt +++ b/reco/qa/CMakeLists.txt @@ -14,7 +14,6 @@ ${CBMDATA_DIR}/tof Set(SYSTEM_INCLUDE_DIRECTORIES ${BASE_INCLUDE_DIRECTORIES} - ${VC_INCLUDE_DIRS} ${ROOT_INCLUDE_DIR} ) diff --git a/reco/steer/CMakeLists.txt b/reco/steer/CMakeLists.txt index 14a50d7cf1..e5f21ecf09 100644 --- a/reco/steer/CMakeLists.txt +++ b/reco/steer/CMakeLists.txt @@ -62,10 +62,10 @@ ${IPC_INCLUDE_DIRECTORY} # ---- Link directories ---------------------------------- set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} +${KFParticle_LIB_DIR} # for rich reco ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${KFParticle_LIB_DIR} # for rich reco ) # --------------------------------------------------------- diff --git a/reco/tracking/global/CMakeLists.txt b/reco/tracking/global/CMakeLists.txt index 64cdd31b27..71f75c1275 100755 --- a/reco/tracking/global/CMakeLists.txt +++ b/reco/tracking/global/CMakeLists.txt @@ -37,11 +37,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) Set(LINK_DIRECTORIES - ${ROOT_LIBRARY_DIR} + ${KFParticle_LIB_DIR} ${FAIRROOT_LIBRARY_DIR} + ${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} - ${KFParticle_LIB_DIR} - ${Vc_LIB_DIR} ) Link_Directories( ${LINK_DIRECTORIES}) diff --git a/reco/tracking/vector/CMakeLists.txt b/reco/tracking/vector/CMakeLists.txt index 65835452ce..b86da84603 100644 --- a/reco/tracking/vector/CMakeLists.txt +++ b/reco/tracking/vector/CMakeLists.txt @@ -41,8 +41,6 @@ set(LINK_DIRECTORIES ${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/sim/detectors/trd/CMakeLists.txt b/sim/detectors/trd/CMakeLists.txt index 69f2d62c37..afb0dda8bd 100644 --- a/sim/detectors/trd/CMakeLists.txt +++ b/sim/detectors/trd/CMakeLists.txt @@ -24,16 +24,14 @@ Include_Directories( ${INCLUDE_DIRECTORIES}) Set(SYSTEM_INCLUDE_DIRECTORIES ${BASE_INCLUDE_DIRECTORIES} - ${Boost_INCLUDE_DIR} ) Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} ) link_directories( ${LINK_DIRECTORIES}) diff --git a/sim/transport/geosetup/CMakeLists.txt b/sim/transport/geosetup/CMakeLists.txt index f512c21913..bbcb1e011d 100644 --- a/sim/transport/geosetup/CMakeLists.txt +++ b/sim/transport/geosetup/CMakeLists.txt @@ -76,10 +76,8 @@ set(SYSTEM_INCLUDE_DIRECTORIES Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} ) diff --git a/sim/transport/steer/CMakeLists.txt b/sim/transport/steer/CMakeLists.txt index 45856dd6cd..d119b821f1 100644 --- a/sim/transport/steer/CMakeLists.txt +++ b/sim/transport/steer/CMakeLists.txt @@ -47,11 +47,9 @@ ${BASE_INCLUDE_DIRECTORIES} # ---- Link directories ---------------------------------- set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} ${FAIRROOT_LIBRARY_DIR} +${ROOT_LIBRARY_DIR} ${Boost_LIBRARY_DIRS} -${Vc_LIB_DIR} -${KFParticle_LIB_DIR} ${SIMPATH}/lib ) -- GitLab