Merge branch 'master' into cairo-dev

auto detect glade files
2018-07-20 23:26:50 +02:00 · 2018-07-20 23:22:47 +02:00
1 changed files with 1 additions and 4 deletions
--- a/glade/CMakeLists.txt
+++ b/glade/CMakeLists.txt
@ -1,9 +1,6 @@
 add_custom_target(glib-resources DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/resources.c)
 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
 			${CMAKE_CURRENT_BINARY_DIR}/resources.c
 		   COMMAND
Author	SHA1	Message	Date
Mario Hüttel	40760725b8	Merge branch 'master' into cairo-dev	2018-07-20 23:26:50 +02:00
Mario Hüttel	dac834aef2	auto detect glade files	2018-07-20 23:22:47 +02:00