Commit 1e1dbdf0 authored by dino's avatar dino
Browse files

Modified to link the boost libraries statically

git-svn-id: svn://gal-serv.lnl.infn.it/agata/trunk/narval_emulator@1100 170316e4-aea8-4b27-aad4-0380ec0519c9
parent 2a6a178d
......@@ -14,12 +14,14 @@ ADD_DEFINITIONS(-DNRV_TYPE=NRV_OFFLINE)
# Enable root
ADD_DEFINITIONS(-DTF_ROOTTREE)
FIND_PACKAGE(ROOT)
MESSAGE("Root: ${ROOT_INCLUDE_DIR} ${ROOT_LIBRARY_DIR}")
#MESSAGE("${ROOT_LIBRARIES}")
MESSAGE("Root Dirs: ${ROOT_INCLUDE_DIR} ${ROOT_LIBRARY_DIR}")
MESSAGE("Root Libs: ${ROOT_LIBRARIES}")
# Find Boost
FIND_PACKAGE(Boost)
MESSAGE("Boost: ${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")
MESSAGE("Boost Libs: ${BOOST_LIBRARIES}")
# Enable the vectorized version of the PSA FOM-loop
#ADD_DEFINITIONS(-DUSE_SSE_VERSION)
......@@ -161,14 +163,14 @@ ${PRISMA}/src/zedCalculator.cc
SET(femul_SRCS ${FEMDIR}/femul.cpp ${FEMDIR}/ChainOfActors.cpp ${adf_SRCS} ${actors_SRCS} ${PRISMA_SRCS} )
SET(LINK_DIRECTORIES ${Boost_LIBRARY_DIRS} ${ROOT_LIBRARY_DIR})
#SET(LINK_DIRECTORIES ${Boost_LIBRARY_DIRS} ${ROOT_LIBRARY_DIR})
#MESSAGE("LINK_DIRECTORIES: ${LINK_DIRECTORIES}")
LINK_DIRECTORIES( ${LINK_DIRECTORIES})
#LINK_DIRECTORIES( ${LINK_DIRECTORIES})
IF(WIN32)
SET(LINK_LIBRARIES libboost_thread-mt.a ${ROOT_LIBRARIES})
ELSE()
SET(LINK_LIBRARIES libboost_thread-mt.so ${ROOT_LIBRARIES})
SET(LINK_LIBRARIES ${BOOST_LIBRARIES} ${ROOT_LIBRARIES})
ENDIF()
#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