lcio/src/cpp

diff -u -r1.31 -r1.32
--- CMakeLists.txt	21 Jun 2010 08:34:58 -0000	1.31
+++ CMakeLists.txt	21 Jun 2010 10:09:09 -0000	1.32
@@ -145,11 +145,14 @@

     ADD_CUSTOM_COMMAND(
         OUTPUT "${gen_header_file}"
         #COMMAND echo "run: ${SH} ${PROJECT_BINARY_DIR}/lcio_env_init.sh" java -cp '${LCIO_SOURCE_DIR}/tools/freehep-base.jar:${LCIO_SOURCE_DIR}/tools/freehep-aid.jar:${LCIO_SOURCE_DIR}/tools/freehep-buildtools.jar' org.freehep.aid.Aid -directory '${AID_GEN_CXX_HEADERS_DIR}/' -property config CPPHeaderGenerator "${aid_file}"

-        COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/lcio_env_init.sh" java -cp '${LCIO_SOURCE_DIR}/tools/freehep-base.jar:${LCIO_SOURCE_DIR}/tools/freehep-aid.jar:${LCIO_SOURCE_DIR}/tools/freehep-buildtools.jar' org.freehep.aid.Aid -directory '${AID_GEN_CXX_HEADERS_DIR}/' -property config CPPHeaderGenerator "${aid_file}"

+        COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/lcio_env_init.sh" java -cp
+        '${LCIO_SOURCE_DIR}/tools/freehep-base.jar:${LCIO_SOURCE_DIR}/tools/freehep-aid.jar:${LCIO_SOURCE_DIR}/tools/freehep-buildtools.jar'
+        org.freehep.aid.Aid -directory '${AID_GEN_CXX_HEADERS_DIR}/' -property
+        config CPPHeaderGenerator "${aid_file}" > /dev/null

         #COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/lcio_env_init.sh" ant aid.generate
         DEPENDS "${aid_file}"
         WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"

-        COMMENT "Generating header file ${aid_file_basename}.h"

+        COMMENT "Generating header file EVENT/${aid_file_basename}.h"

     )
 
     #SET_SOURCE_FILES_PROPERTIES( "${gen_header_file}" PROPERTIES HEADER_FILE_ONLY TRUE )

@@ -176,10 +179,13 @@

     ADD_CUSTOM_COMMAND(
         OUTPUT "${gen_header_file}"
         #COMMAND echo "run: ${SH} ${PROJECT_BINARY_DIR}/lcio_env_init.sh" java -cp '${LCIO_SOURCE_DIR}/tools/freehep-base.jar:${LCIO_SOURCE_DIR}/tools/freehep-aid.jar:${LCIO_SOURCE_DIR}/tools/freehep-buildtools.jar' org.freehep.aid.Aid -directory '${AID_GEN_CXX_HEADERS_DIR}/' -property config CPPHeaderGenerator "${aid_file}"

-        COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/lcio_env_init.sh" java -cp '${LCIO_SOURCE_DIR}/tools/freehep-base.jar:${LCIO_SOURCE_DIR}/tools/freehep-aid.jar:${LCIO_SOURCE_DIR}/tools/freehep-buildtools.jar' org.freehep.aid.Aid -directory '${AID_GEN_CXX_HEADERS_DIR}/' -property config CPPHeaderGenerator "${aid_file}"

+        COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/lcio_env_init.sh" java -cp
+        '${LCIO_SOURCE_DIR}/tools/freehep-base.jar:${LCIO_SOURCE_DIR}/tools/freehep-aid.jar:${LCIO_SOURCE_DIR}/tools/freehep-buildtools.jar'
+        org.freehep.aid.Aid -directory '${AID_GEN_CXX_HEADERS_DIR}/' -property
+        config CPPHeaderGenerator "${aid_file}" > /dev/null

         DEPENDS "${aid_file}"
         WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"

-        COMMENT "Generating header file ${aid_file_basename}.h"

+        COMMENT "Generating header file IO/${aid_file_basename}.h"

     )
 
     #SET_SOURCE_FILES_PROPERTIES( "${gen_header_file}" PROPERTIES HEADER_FILE_ONLY TRUE )