lcio
diff -u -r1.72 -r1.73
--- CMakeLists.txt 23 Jun 2010 14:49:10 -0000 1.72
+++ CMakeLists.txt 25 Jun 2010 11:03:24 -0000 1.73
@@ -153,8 +153,7 @@
ENDIF()
- # generate shell script for setting environment
- # and calling ant aid
+ # generate shell script for setting lcio environment
SET( LCIO_ENV_INIT "${PROJECT_BINARY_DIR}/lcio_env_init.sh" )
IF( NOT EXISTS ${LCIO_ENV_INIT} )
MESSAGE( STATUS "Generating LCIO env init script..." )
@@ -163,7 +162,8 @@
"export JDK_HOME=${JAVA_HOME}\n"
"export JAVA_HOME=${JAVA_HOME}\n"
"export PATH=${PROJECT_SOURCE_DIR}/tools:${JAVA_BIN_PATH}:$PATH\n"
- "eval $*" )
+ "eval $*\n"
+ )
ENDIF()
# create "always out-of-date" headers target
lcio/src/cpp/include/rootDict
diff -u -r1.3 -r1.4
--- CMakeLists.txt 25 Jun 2010 09:51:00 -0000 1.3
+++ CMakeLists.txt 25 Jun 2010 11:03:24 -0000 1.4
@@ -64,7 +64,8 @@
OUTPUT ${dict_src_file}
#COMMAND ${ROOT_HOME}/bin/rootcint
#COMMAND $ENV{ROOTSYS}/bin/rootcint
- COMMAND ${ROOT_CINT}
+ #COMMAND ${SH} ${ROOT_ENV_INIT} ${ROOT_CINT} ### somehow rootcint does not like to be called with full path !! ...
+ COMMAND ${SH} ${ROOT_ENV_INIT} rootcint
ARGS -f ${dict_src_file} -c -DHANDLE_LCIO_EXCEPTIONS=IGNORED_FOR_CINT
-I${AID_GEN_CXX_HEADERS_DIR} -I${LCIO_CXX_HEADERS_DIR} ${header_full_path} ${dict_hdr_file}
WORKING_DIRECTORY "${LCIO_BINARY_DIR}"
@@ -101,6 +102,18 @@
#FILE( APPEND "${cint_script}" "SET( ENV{LD_LIBRARY_PATH} \$ENV{ROOTSYS}/lib:\$ENV{LD_LIBRARY_PATH} )\n" )
#FILE( APPEND "${cint_script}" "EXEC_PROGRAM( rootcint -f \${dict_src_file} -c -DHANDLE_LCIO_EXCEPTIONS=IGNORED_FOR_CINT -Iinclude \${lcio_hdr_rel_path} \${dict_hdr_file} )\n" )
+ # generate shell script for setting root environment
+ SET( ROOT_ENV_INIT "${PROJECT_BINARY_DIR}/root_env_init.sh" )
+ IF( NOT EXISTS ${ROOT_ENV_INIT} )
+ MESSAGE( STATUS "Generating ROOT env init script..." )
+ FILE( WRITE "${ROOT_ENV_INIT}"
+ "# script to initialize root environment\n"
+ "export ROOTSYS=${ROOT_HOME}\n"
+ "export PATH=$ROOTSYS/bin:$PATH\n"
+ "export LD_LIBRARY_PATH=$ROOTSYS/lib:$LD_LIBRARY_PATH\n"
+ "eval $*\n"
+ )
+ ENDIF()
# EVENT aid files