Skip to content

Commit

Permalink
CMake: Removing FastJet linking because it adds system libraries to r…
Browse files Browse the repository at this point in the history
…ootmaps

 - fastjet-config is reporting a list of libraries, including system librarie
that were added to the rootmaps. Cint is not able to load libraries not found
inside the LD_LIBRARY_PATH
 - ALIROOT-5829
  • Loading branch information
agrigora committed Mar 5, 2015
1 parent a1313e7 commit 6fbf33c
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions HLT/trigger/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ if(FASTJET_FOUND)
add_definitions(${FASTJET_DEFINITIONS})

set(SRC ${SRCS}
AliHLTTriggerFastJet.h
AliHLTTriggerFastJet.cxx
)
endif()

Expand All @@ -99,9 +99,14 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
# Generate the ROOT map
# Dependecies
set(LIBDEPS STEERBase STEER ESD CDB AOD RAWDatabase RAWDatarec ANALYSISalice HLTbase AliHLTUtil AliHLTITS AliHLTMUON AliHLTTRD TRDbase TRDrec TPCcalib MUONraw GenVector Gpad Graf Smatrix)
if(FASTJET_FOUND)
set(LIBDEPS ${LIBDEPS} ${FASTJET_LIBS})
endif(FASTJET_FOUND)

# !! TO FIX !!
# Temporary removing the linking to fastjet libraries as it adds system libraries to the rootmaps
# Rootmaps should contain only libraries that can be found in the LD_LIBRARY_PATH
#if(FASTJET_FOUND)
# set(LIBDEPS ${LIBDEPS} ${FASTJET_LIBS})
#endif(FASTJET_FOUND)

generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")

# Add a library to the project using the specified source files
Expand Down

0 comments on commit 6fbf33c

Please sign in to comment.