From: johanengelen Date: Sat, 5 Apr 2008 16:49:31 +0000 (+0000) Subject: cmake: fix error in UseGlibMarshal.cmake X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f696d23b6cbdc72b76294864f20fd8a434a07aec;p=inkscape.git cmake: fix error in UseGlibMarshal.cmake --- diff --git a/CMakeScripts/UseGlibMarshal.cmake b/CMakeScripts/UseGlibMarshal.cmake index f9de62f4a..d6e3b2cb3 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/"" ) - EXECUTE_PROCESS(COMMAND ${GLIB_MARSHAL_EXECUTABLE} --prefix=${GLIB_MARSHAL_PREFIX} --header ${CMAKE_CURRENT_SOURCE_DIR}/${GLIB_MARSHAL_LIST} - OUTPUT_VARIABLE ${GLIB_MARSHAL_OUTPUT_HEADER} - COMMAND ${GLIB_MARSHAL_EXECUTABLE} --prefix=${GLIB_MARSHAL_PREFIX} --body ${CMAKE_CURRENT_SOURCE_DIR}/${GLIB_MARSHAL_LIST} - OUTPUT_VARIABLE ${GLIB_MARSHAL_OUTPUT_TEMP}) + EXECUTE_PROCESS(COMMAND "${GLIB_MARSHAL_EXECUTABLE} --prefix=${GLIB_MARSHAL_PREFIX} --header ${CMAKE_CURRENT_SOURCE_DIR}/${GLIB_MARSHAL_LIST}" + OUTPUT_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}" ) 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}")