From 409094ba268e83e65c18ec2efe0608fe1d3f970d Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 17 Aug 2015 14:39:49 +0200 Subject: [PATCH] macdeployqt.sh path is relative to the script which starts it --- cmake/EthDependencies.cmake | 2 +- cmake/EthExecutableHelper.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index 0d4a7a4bc..389664c99 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -17,7 +17,7 @@ set(ETH_GENERATED_DIR "${PROJECT_BINARY_DIR}/gen") include_directories(${ETH_GENERATED_DIR}) # custom cmake scripts -set(ETH_SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/cmake/scripts) +set(ETH_SCRIPTS_DIR ${CMAKE_CURRENT_LIST_DIR}/scripts) # Qt5 requires opengl # TODO use proper version of windows SDK (32 vs 64) diff --git a/cmake/EthExecutableHelper.cmake b/cmake/EthExecutableHelper.cmake index 40d4ae86a..dd4dafddb 100644 --- a/cmake/EthExecutableHelper.cmake +++ b/cmake/EthExecutableHelper.cmake @@ -95,7 +95,7 @@ macro(eth_install_executable EXECUTABLE) add_custom_command(TARGET ${EXECUTABLE} POST_BUILD COMMAND ${MACDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app -executable=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents/MacOS/${EXECUTABLE} ${eth_qml_dir} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} - COMMAND sh ${CMAKE_SOURCE_DIR}/cmake/scripts/macdeployfix.sh ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents + COMMAND sh ${ETH_SCRIPTS_DIR}/macdeployfix.sh ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents ) # This tool and next will inspect linked libraries in order to determine which dependencies are required