index 3a961081f853d10331c2971cd75701f35d8eb28b..5843d00afc51985d12f8b5052f52f2d7cad9da75 100644 (file)
MACRO(GLIB_MARSHAL GLIB_MARSHAL_PREFIX GLIB_MARSHAL_LIST GLIB_MARSHAL_OUTPUT_LOCATION)
IF(GLIB_MARSHAL_EXECUTABLE)
SET(GLIB_MARSHAL_OUTPUT_TEMP)
- SET(GLIB_MARSHAL_OUTPUT_EXTRA_LINE "#include \"${GLIB_MARSHAL_PREFIX}.h\" " )
+ SET(GLIB_MARSHAL_OUTPUT_EXTRA_LINE "#include \"${GLIB_MARSHAL_PREFIX}.h\" \n" )
EXECUTE_PROCESS(COMMAND "${GLIB_MARSHAL_EXECUTABLE} --prefix=${GLIB_MARSHAL_PREFIX} --header ${CMAKE_CURRENT_SOURCE_DIR}/${GLIB_MARSHAL_LIST}"
- OUTPUT_VARIABLE "${GLIB_MARSHAL_OUTPUT_HEADER}" )
+ RESULT_VARIABLE GLIB_MARSHAL_OUTPUT_HEADER )
EXECUTE_PROCESS(COMMAND "${GLIB_MARSHAL_EXECUTABLE} --prefix=${GLIB_MARSHAL_PREFIX} --body ${CMAKE_CURRENT_SOURCE_DIR}/${GLIB_MARSHAL_LIST}"
- OUTPUT_VARIABLE "${GLIB_MARSHAL_OUTPUT_TEMP}" )
+ RESULT_VARIABLE GLIB_MARSHAL_OUTPUT_TEMP )
SET(GLIB_MARSHAL_OUTPUT_CPP "${GLIB_MARSHAL_OUTPUT_EXTRA_LINE}${GLIB_MARSHAL_OUTPUT_TEMP}")
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${GLIB_MARSHAL_PREFIX}.h "${GLIB_MARSHAL_OUTPUT_HEADER}")
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${GLIB_MARSHAL_PREFIX}.cpp "${GLIB_MARSHAL_OUTPUT_CPP}")