Browse Source

Merge branch 'res' into v8console

Conflicts:
	cmake/EthUtils.cmake
cl-refactor
Marek Kotewicz 10 years ago
parent
commit
7013cad037
  1. 2
      cmake/EthUtils.cmake

2
cmake/EthUtils.cmake

@ -74,8 +74,6 @@ function(eth_add_resources RESOURCE_FILE OUT_FILE)
list(APPEND filenames "${${resource}}")
endforeach(resource)
message(STATUS "filenames; ${filenames}")
add_custom_command(OUTPUT ${OUTPUT}
COMMAND ${CMAKE_COMMAND} -DETH_RES_FILE="${RESOURCE_FILE}" -P "${ETH_SCRIPTS_DIR}/resources.cmake"
DEPENDS ${filenames}

Loading…
Cancel
Save