summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2008-04-05 16:49:31 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2008-04-05 16:49:31 +0000
commitee6bcfaaf2fbaa47522f80558a45cf56af1c7269 (patch)
tree76d8a070a6ec827f90322af4a1416c64b5c27684
parentCmake: add missing CMakeLists.txt (diff)
downloadinkscape-ee6bcfaaf2fbaa47522f80558a45cf56af1c7269.tar.gz
inkscape-ee6bcfaaf2fbaa47522f80558a45cf56af1c7269.zip
cmake: fix error in UseGlibMarshal.cmake
(bzr r5341)
-rw-r--r--CMakeScripts/UseGlibMarshal.cmake10
1 files changed, 5 insertions, 5 deletions
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}")