Merge branch 'master' into cairo-dev

This commit is contained in:
Mario Hüttel 2018-07-20 23:26:50 +02:00
commit 40760725b8

View File

@ -1,9 +1,6 @@
add_custom_target(glib-resources DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/resources.c) add_custom_target(glib-resources DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/resources.c)
add_custom_command(DEPENDS add_custom_command(DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/resources.xml ${CMAKE_CURRENT_SOURCE_DIR}/*.glade
${CMAKE_CURRENT_SOURCE_DIR}/main.glade
${CMAKE_CURRENT_SOURCE_DIR}/dialog.glade
${CMAKE_CURRENT_SOURCE_DIR}/layer-widget.glade
OUTPUT OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/resources.c ${CMAKE_CURRENT_BINARY_DIR}/resources.c
COMMAND COMMAND