Commit 20da7885 authored by dino's avatar dino
Browse files

Correct definition of TRF_ROOTTREE

git-svn-id: svn://gal-serv.lnl.infn.it/agata/trunk/narval_emulator@1134 170316e4-aea8-4b27-aad4-0380ec0519c9
parent e5b5612c
...@@ -12,7 +12,7 @@ set(CMAKE_MODULE_PATH ".") ...@@ -12,7 +12,7 @@ set(CMAKE_MODULE_PATH ".")
ADD_DEFINITIONS(-DNRV_TYPE=NRV_OFFLINE) ADD_DEFINITIONS(-DNRV_TYPE=NRV_OFFLINE)
# Enable root # Enable root
ADD_DEFINITIONS(-DTF_ROOTTREE) ADD_DEFINITIONS(-DTRF_ROOTTREE)
FIND_PACKAGE(ROOT) FIND_PACKAGE(ROOT)
MESSAGE("Root Dirs: ${ROOT_INCLUDE_DIR} ${ROOT_LIBRARY_DIR}") MESSAGE("Root Dirs: ${ROOT_INCLUDE_DIR} ${ROOT_LIBRARY_DIR}")
MESSAGE("Root Libs: ${ROOT_LIBRARIES}") MESSAGE("Root Libs: ${ROOT_LIBRARIES}")
...@@ -20,7 +20,7 @@ MESSAGE("Root Libs: ${ROOT_LIBRARIES}") ...@@ -20,7 +20,7 @@ MESSAGE("Root Libs: ${ROOT_LIBRARIES}")
# Find Boost # Find Boost
FIND_PACKAGE(Boost) FIND_PACKAGE(Boost)
MESSAGE("Boost Dirs: ${Boost_INCLUDE_DIR} ${Boost_LIBRARY_DIRS}") MESSAGE("Boost Dirs: ${Boost_INCLUDE_DIR} ${Boost_LIBRARY_DIRS}")
SET(BOOST_LIBRARIES "-L${Boost_LIBRARY_DIRS} -l:libboost_system.a -l:libboost_thread.a") SET(BOOST_LIBRARIES "-L${Boost_LIBRARY_DIRS} -lboost_system -lboost_thread")
MESSAGE("Boost Libs: ${BOOST_LIBRARIES}") MESSAGE("Boost Libs: ${BOOST_LIBRARIES}")
# For the vectorized version of the PSA FOM-loop # For the vectorized version of the PSA FOM-loop
...@@ -163,9 +163,9 @@ SET(femul_SRCS ${FEMDIR}/femul.cpp ${FEMDIR}/ChainOfActors.cpp ${adf_SRCS} ${a ...@@ -163,9 +163,9 @@ SET(femul_SRCS ${FEMDIR}/femul.cpp ${FEMDIR}/ChainOfActors.cpp ${adf_SRCS} ${a
#LINK_DIRECTORIES( ${LINK_DIRECTORIES}) #LINK_DIRECTORIES( ${LINK_DIRECTORIES})
IF(WIN32) IF(WIN32)
SET(LINK_LIBRARIES libboost_thread-mt.a ${ROOT_LIBRARIES}) SET(LINK_LIBRARIES libboost_thread-mt.a ${ROOT_LIBRARIES})
ELSE() ELSE()
SET(LINK_LIBRARIES ${BOOST_LIBRARIES} ${ROOT_LIBRARIES}) SET(LINK_LIBRARIES ${BOOST_LIBRARIES} ${ROOT_LIBRARIES})
ENDIF() ENDIF()
#MESSAGE("LINK_LIBRARIES: ${LINK_LIBRARIES}") #MESSAGE("LINK_LIBRARIES: ${LINK_LIBRARIES}")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment