From 5e9cef4fb45f9d571bd897c09c1247649c0bb779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Sat, 14 Mar 2020 20:43:57 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@788 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/QtWraps.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qad/QtWraps.cmake b/qad/QtWraps.cmake index 5426670..e92e17d 100644 --- a/qad/QtWraps.cmake +++ b/qad/QtWraps.cmake @@ -397,12 +397,23 @@ macro(qt_add_library _NAME) _qt_split_add_args(_PREF _ARGS ${ARGN}) #message("${_PREF}") #message("${_ARGS}") + if(APPLE) + if(CMAKE_CROSSCOMPILING) + set(_PREV_CIND "${CMAKE_INSTALL_NAME_DIR}") + set(CMAKE_INSTALL_NAME_DIR "@rpath") + endif() + endif() set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}}) add_library(${_TARGET} ${_PREF} ${_ARGS}) set(_${_NAME}_is_qt 1) target_include_directories(${_TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES}) #message("add lib: \"${_TARGET}\"") + if(APPLE) + if(CMAKE_CROSSCOMPILING) + set(CMAKE_INSTALL_NAME_DIR "${_PREV_CIND}") + endif() + endif() # # Apple crosscompiling rpath patch # if (APPLE AND CMAKE_CROSSCOMPILING AND CMAKE_MACOSX_RPATH) # foreach(_RP ${CMAKE_INSTALL_RPATH})