diff --git a/qad/QtWraps.cmake b/qad/QtWraps.cmake index e92e17d..a529df1 100644 --- a/qad/QtWraps.cmake +++ b/qad/QtWraps.cmake @@ -359,16 +359,18 @@ macro(qt_add_executable _NAME) foreach(_v ${_QT_VERSIONS_}) if (LOCAL_FOUND${_v}) _qt_split_add_args(_PREF _ARGS ${ARGN}) - #message("${_PREF}") - #message("${_ARGS}") + if(APPLE) + set(_PREV_CIND "${CMAKE_INSTALL_NAME_DIR}") + set(CMAKE_INSTALL_NAME_DIR "@rpath") + endif() set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}}) add_executable(${_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}) -### add_definitions(${Qt5Widgets_DEFINITIONS}) -### target_compile_definitions(${_TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES}) - #message("add exe: \"${_TARGET}\", \"${_PREF}\"") + if(APPLE) + set(CMAKE_INSTALL_NAME_DIR "${_PREV_CIND}") + endif() # # Apple crosscompiling rpath patch # if (APPLE AND CMAKE_CROSSCOMPILING AND CMAKE_MACOSX_RPATH) # foreach(_RP ${CMAKE_INSTALL_RPATH}) @@ -395,13 +397,9 @@ macro(qt_add_library _NAME) foreach(_v ${_QT_VERSIONS_}) if (LOCAL_FOUND${_v}) _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() + set(_PREV_CIND "${CMAKE_INSTALL_NAME_DIR}") + set(CMAKE_INSTALL_NAME_DIR "@rpath") endif() set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}}) add_library(${_TARGET} ${_PREF} ${_ARGS}) @@ -410,9 +408,7 @@ macro(qt_add_library _NAME) #message("add lib: \"${_TARGET}\"") if(APPLE) - if(CMAKE_CROSSCOMPILING) - set(CMAKE_INSTALL_NAME_DIR "${_PREV_CIND}") - endif() + set(CMAKE_INSTALL_NAME_DIR "${_PREV_CIND}") endif() # # Apple crosscompiling rpath patch # if (APPLE AND CMAKE_CROSSCOMPILING AND CMAKE_MACOSX_RPATH)