Fix serverless content not using correct directories

This commit is contained in:
Ryan Huffman 2018-03-26 12:48:25 -07:00 committed by Seth Alves
parent 6948de7e24
commit d01a58517f

View file

@ -326,7 +326,7 @@ if (APPLE)
fixup_interface() fixup_interface()
else() else()
set(RESOURCES_DEV_DIR "$<TARGET_FILE_DIR:${TARGET_NAME}>") set(RESOURCES_DEV_DIR "$<TARGET_FILE_DIR:${TARGET_NAME}>/resources")
# copy the resources files beside the executable # copy the resources files beside the executable
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
@ -388,7 +388,7 @@ if (DOWNLOAD_SERVERLESS_CONTENT)
# for dev builds, copy the serverless content to the resources folder # for dev builds, copy the serverless content to the resources folder
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory COMMAND "${CMAKE_COMMAND}" -E copy_directory
"${SOURCE_DIR}/serverless/" "${SOURCE_DIR}"
"${RESOURCES_DEV_DIR}/serverless" "${RESOURCES_DEV_DIR}/serverless"
) )
endif () endif ()