diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2008-04-05 17:19:47 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2008-04-05 17:19:47 +0000 |
| commit | 4e22523df58255dd5e3cc51548bb336004aff518 (patch) | |
| tree | a0b0d4fbb914904a5f04709e103a58547f76203e /CMakeScripts | |
| parent | cmake: fix prefix (diff) | |
| download | inkscape-4e22523df58255dd5e3cc51548bb336004aff518.tar.gz inkscape-4e22523df58255dd5e3cc51548bb336004aff518.zip | |
Cmake: UseGlibMarshal update
(bzr r5347)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/UseGlibMarshal.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeScripts/UseGlibMarshal.cmake b/CMakeScripts/UseGlibMarshal.cmake index 5843d00af..6a6167bed 100644 --- a/CMakeScripts/UseGlibMarshal.cmake +++ b/CMakeScripts/UseGlibMarshal.cmake @@ -19,9 +19,10 @@ MACRO(GLIB_MARSHAL GLIB_MARSHAL_PREFIX GLIB_MARSHAL_LIST GLIB_MARSHAL_OUTPUT_LOC EXECUTE_PROCESS(COMMAND "${GLIB_MARSHAL_EXECUTABLE} --prefix=${GLIB_MARSHAL_PREFIX} --header ${CMAKE_CURRENT_SOURCE_DIR}/${GLIB_MARSHAL_LIST}" RESULT_VARIABLE GLIB_MARSHAL_OUTPUT_HEADER ) EXECUTE_PROCESS(COMMAND "${GLIB_MARSHAL_EXECUTABLE} --prefix=${GLIB_MARSHAL_PREFIX} --body ${CMAKE_CURRENT_SOURCE_DIR}/${GLIB_MARSHAL_LIST}" - RESULT_VARIABLE GLIB_MARSHAL_OUTPUT_TEMP ) - SET(GLIB_MARSHAL_OUTPUT_CPP "${GLIB_MARSHAL_OUTPUT_EXTRA_LINE}${GLIB_MARSHAL_OUTPUT_TEMP}") + RESULT_VARIABLE GLIB_MARSHAL_OUTPUT_CPP ) +# 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}") + FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${GLIB_MARSHAL_PREFIX}.cpp "${GLIB_MARSHAL_OUTPUT_EXTRA_LINE}") + FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${GLIB_MARSHAL_PREFIX}.cpp "${GLIB_MARSHAL_OUTPUT_CPP}") ENDIF(GLIB_MARSHAL_EXECUTABLE) ENDMACRO(GLIB_MARSHAL) |