Skip to content
Snippets Groups Projects
Commit 5888a1ac authored by Bertram Kopf's avatar Bertram Kopf
Browse files

added Geneva-path to SetEnv_rub & some modifications+fixes in CMake steering files

parent 429930e5
No related branches found
No related tags found
No related merge requests found
......@@ -54,7 +54,7 @@ FIND_PACKAGE(Geneva REQUIRED)
MESSAGE("GENEVA_INCLUDE_DIRS: " ${GENEVA_INCLUDE_DIRS})
MESSAGE("GENEVA_LIBRARY_DIRS: " ${GENEVA_LIBRARY_DIRS})
MESSAGE("GENEVA_LIBRARIES: " ${GENEVA_LIBRARIES})
MESSAGE("GENEVA_LIBRARY: " ${GENEVA_LIBRARY})
# Set the library type to static by default
IF( NOT PAWIAN_STATIC )
SET( PAWIAN_STATIC TRUE )
......
......@@ -19,7 +19,7 @@ endif()
find_path(GENEVA_INCLUDE_DIRS GBoolean.hpp
HINTS ${_GENEVA_INCLUDE_SEARCH_DIRS})
set(GENEVA_LIBRARIES geneva-opt libgeneva-extcomm)
set(GENEVA_LIBRARIES geneva-opt)
find_library(GENEVA_LIBRARY ${GENEVA_LIBRARIES}
HINTS ${_GENEVA_LIBRARIES_SEARCH_DIRS})
......
......@@ -57,6 +57,10 @@ MACRO (WRITE_CONFIG_FILE filename)
WRITE_TO_FILE(${filename} BOOST_ROOT ${BOOST_ROOT} APPEND)
endif(BOOST_ROOT)
if(Minuit2_ROOT)
WRITE_TO_FILE(${filename} Minuit2_ROOT ${Minuit2_ROOT} APPEND)
endif(Minuit2_ROOT)
WRITE_TO_FILE(${filename} ROOTSYS ${ROOTSYS} APPEND)
CONVERT_LIST_TO_STRING(${LD_LIBRARY_PATH})
......
......@@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES (AFTER
${GENEVA_ROOT}/examples/include
)
TARGET_LINK_LIBRARIES (${EXECUTABLENAME} /opt/geneva/lib/libgeneva-opt.so)
TARGET_LINK_LIBRARIES (${EXECUTABLENAME} ${GENEVA_LIBRARY})
TARGET_LINK_LIBRARIES (${EXECUTABLENAME} ${Boost_LIBRARIES})
INSTALL ( TARGETS ${EXECUTABLENAME} DESTINATION bin/${EXECUTABLENAME})
......
setenv ROOTSYS /opt/root/5.24-00/Linux26SL5_x86_64_gcc412
setenv Minuit2_ROOT /data/pegasus1/PANDA/PWA
setenv GENEVA_ROOT /data/pegasus1/PANDA/PWA/geneva
echo "\n ROOTSYS"
echo $ROOTSYS
echo "\n Minuit2_ROOT"
echo $Minuit2_ROOT
echo "\n ROOTSYS: " $ROOTSYS
echo "\n Minuit2_ROOT: " $Minuit2_ROOT
echo "\n GENEVA_ROOT: " $GENEVA_ROOT
echo "\n"
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment