diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-04-05 17:09:51 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-04-05 17:09:51 +0000 |
| commit | 9ee740559d6e5c69a98bab36956f73cc709d08aa (patch) | |
| tree | 4704a04fa538d12aff3573232a224540b647474a /CMakeScripts/UseGlibMarshal.cmake | |
| parent | cmake: revert last commit because the current directory is included when buil... (diff) | |
| download | inkscape-9ee740559d6e5c69a98bab36956f73cc709d08aa.tar.gz inkscape-9ee740559d6e5c69a98bab36956f73cc709d08aa.zip | |
cmake: marshal files; fix to use correct result variable
(bzr r5345)
Diffstat (limited to 'CMakeScripts/UseGlibMarshal.cmake')
| -rw-r--r-- | CMakeScripts/UseGlibMarshal.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeScripts/UseGlibMarshal.cmake b/CMakeScripts/UseGlibMarshal.cmake index 3a961081f..5843d00af 100644 --- a/CMakeScripts/UseGlibMarshal.cmake +++ b/CMakeScripts/UseGlibMarshal.cmake @@ -14,12 +14,12 @@ FIND_PROGRAM(GLIB_MARSHAL_EXECUTABLE NAMES glib-genmarshal PATHS /usr/local/bin 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}") |