SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@763 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Бычков Андрей
2020-03-09 19:51:11 +00:00
parent 226876114b
commit ba07023c5b
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
qad/QtWraps.cmake
View File

@@ -400,16 +400,16 @@ macro(qt_add_library _NAME)
target_include_directories(${_TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES}) 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}\"") #message("add lib: \"${_TARGET}\"")
# Apple crosscompiling rpath patch # # Apple crosscompiling rpath patch
if (APPLE AND CMAKE_CROSSCOMPILING AND CMAKE_MACOSX_RPATH) # if (APPLE AND CMAKE_CROSSCOMPILING AND CMAKE_MACOSX_RPATH)
foreach(_RP ${CMAKE_INSTALL_RPATH}) # foreach(_RP ${CMAKE_INSTALL_RPATH})
add_custom_command(TARGET ${_TARGET} POST_BUILD # add_custom_command(TARGET ${_TARGET} POST_BUILD
COMMAND "${CMAKE_INSTALL_NAME_TOOL}" # COMMAND "${CMAKE_INSTALL_NAME_TOOL}"
"-add_rpath" "${_RP}" # "-add_rpath" "${_RP}"
"$<TARGET_FILE_DIR:${_TARGET}>/$<TARGET_FILE_NAME:${_TARGET}>" # "$<TARGET_FILE_DIR:${_TARGET}>/$<TARGET_FILE_NAME:${_TARGET}>"
COMMENT "Add to ${_TARGET} rpath \"${_RP}\"") # COMMENT "Add to ${_TARGET} rpath \"${_RP}\"")
endforeach() # endforeach()
endif() # endif()
list(APPEND _ALL_TARGETS "${_TARGET}") list(APPEND _ALL_TARGETS "${_TARGET}")
set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE) set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)