From 44bd19fbf413c09bd173f8f64eaaaaf62f03fb7a Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 11 Jan 2016 12:55:47 +0100 Subject: [PATCH] Merge with develop --- code/ryzom/client/src/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index ee9eb48ad..4b2dfc686 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -75,6 +75,9 @@ IF(WITH_RYZOM_CLIENT) ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/ryzom.icns ${RYZOM_RESOURCES_DIR}) ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR}) + # remove any present installscript_osx.vdf before signing + ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND rm -f ${MAC_RESOURCES_DIR}/installscript_osx.vdf) + IF(RYZOM_DATA_DIR) ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -RpX ${RYZOM_DATA_DIR} ${RYZOM_RESOURCES_DIR}) ENDIF()