SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-09 13:53:10 +00:00
parent 215691a5ed
commit 19fe0c750b
5 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
qad/QtWraps.cmake
View File

@@ -365,6 +365,20 @@ macro(qt_add_executable _NAME)
### add_definitions(${Qt5Widgets_DEFINITIONS})
### target_compile_definitions(${_TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
#message("add exe: \"${_TARGET}\", \"${_PREF}\"")
# Apple crosscompiling rpath patch
if (APPLE AND CMAKE_CROSSCOMPILING AND CMAKE_MACOSX_RPATH)
foreach(_RP ${CMAKE_INSTALL_RPATH})
add_custom_command(TARGET ${_TARGET} POST_BUILD
COMMAND "${CMAKE_INSTALL_NAME_TOOL}"
"-add_rpath" "${_RP}"
"$<TARGET_FILE_DIR:${_TARGET}>/$<TARGET_FILE_NAME:${_TARGET}>"
COMMENT "Add to ${_TARGET} rpath \"${_RP}\"")
endforeach()
endif()
list(APPEND _ALL_TARGETS "${_TARGET}")
set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
endif()
endforeach()
endmacro()
@@ -385,6 +399,20 @@ macro(qt_add_library _NAME)
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}\"")
# Apple crosscompiling rpath patch
if (APPLE AND CMAKE_CROSSCOMPILING AND CMAKE_MACOSX_RPATH)
foreach(_RP ${CMAKE_INSTALL_RPATH})
add_custom_command(TARGET ${_TARGET} POST_BUILD
COMMAND "${CMAKE_INSTALL_NAME_TOOL}"
"-add_rpath" "${_RP}"
"$<TARGET_FILE_DIR:${_TARGET}>/$<TARGET_FILE_NAME:${_TARGET}>"
COMMENT "Add to ${_TARGET} rpath \"${_RP}\"")
endforeach()
endif()
list(APPEND _ALL_TARGETS "${_TARGET}")
set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
endif()
endforeach()
endmacro()