Merge branch 'res' into v8console

Conflicts: cmake/EthUtils.cmake
10 years ago · 7013cad037
1 changed files with 1 additions and 3 deletions
--- a/cmake/EthUtils.cmake
+++ b/cmake/EthUtils.cmake
@ -74,9 +74,7 @@ function(eth_add_resources RESOURCE_FILE OUT_FILE)
 		list(APPEND filenames "${${resource}}")
 	endforeach(resource)

-	message(STATUS "filenames; ${filenames}")
-
-	add_custom_command(OUTPUT ${OUTPUT}
+    add_custom_command(OUTPUT ${OUTPUT}
 		COMMAND ${CMAKE_COMMAND} -DETH_RES_FILE="${RESOURCE_FILE}" -P "${ETH_SCRIPTS_DIR}/resources.cmake"
 		DEPENDS ${filenames}
 	)