diff options
| -rw-r--r-- | CMakeScripts/UseGlibMarshal.cmake | 10 | ||||
| -rw-r--r-- | src/helper/CMakeLists.txt | 23 |
2 files changed, 28 insertions, 5 deletions
diff --git a/CMakeScripts/UseGlibMarshal.cmake b/CMakeScripts/UseGlibMarshal.cmake index 79ae08f4f..f9de62f4a 100644 --- a/CMakeScripts/UseGlibMarshal.cmake +++ b/CMakeScripts/UseGlibMarshal.cmake @@ -1,7 +1,7 @@ # - This is a module to Generate files using Glib-Marshal # Both the header and source files (.h and .cpp) # Copyright 2008 - Joshua L. Blocher -# +# # And it defines the following variables: # GLIB_MARSHAL_PREFIX - The name of the files # GLIB_MARSHAL_LIST - File to Generate from @@ -15,10 +15,10 @@ MACRO(GLIB_MARSHAL GLIB_MARSHAL_PREFIX GLIB_MARSHAL_LIST GLIB_MARSHAL_OUTPUT_LOC IF(GLIB_MARSHAL_EXECUTABLE) SET(GLIB_MARSHAL_OUTPUT_TEMP) 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} + + 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}) 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}") diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt new file mode 100644 index 000000000..dc975cf20 --- /dev/null +++ b/src/helper/CMakeLists.txt @@ -0,0 +1,23 @@ +include(UseGlibMarshal) + +SET(Marshal +sp-marshal.list +) + +GLIB_MARSHAL(sp-marshal ${Marshal} ${CMAKE_CURRENT_BINARY_DIR}) + +SET(helper_SRC +action.cpp +gnome-utils.cpp +pixbuf-ops.cpp +png-write.cpp +stock-items.cpp +unit-menu.cpp +units.cpp +units-test.cpp +unit-tracker.cpp +window.cpp +sp-marshal.list +# we generate this file and it's .h counter-part +sp-marshal.cpp +) |