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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-15 09:23:09 +00:00
parent 5e9cef4fb4
commit 3b8c8c840e
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
qad/QtWraps.cmake
View File

@@ -359,16 +359,18 @@ macro(qt_add_executable _NAME)
foreach(_v ${_QT_VERSIONS_}) foreach(_v ${_QT_VERSIONS_})
if (LOCAL_FOUND${_v}) if (LOCAL_FOUND${_v})
_qt_split_add_args(_PREF _ARGS ${ARGN}) _qt_split_add_args(_PREF _ARGS ${ARGN})
#message("${_PREF}") if(APPLE)
#message("${_ARGS}") set(_PREV_CIND "${CMAKE_INSTALL_NAME_DIR}")
set(CMAKE_INSTALL_NAME_DIR "@rpath")
endif()
set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}}) set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
add_executable(${_TARGET} ${_PREF} ${_ARGS}) add_executable(${_TARGET} ${_PREF} ${_ARGS})
set(_${_NAME}_is_qt 1) 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}) 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 # # 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})
@@ -395,13 +397,9 @@ macro(qt_add_library _NAME)
foreach(_v ${_QT_VERSIONS_}) foreach(_v ${_QT_VERSIONS_})
if (LOCAL_FOUND${_v}) if (LOCAL_FOUND${_v})
_qt_split_add_args(_PREF _ARGS ${ARGN}) _qt_split_add_args(_PREF _ARGS ${ARGN})
#message("${_PREF}")
#message("${_ARGS}")
if(APPLE) if(APPLE)
if(CMAKE_CROSSCOMPILING) set(_PREV_CIND "${CMAKE_INSTALL_NAME_DIR}")
set(_PREV_CIND "${CMAKE_INSTALL_NAME_DIR}") set(CMAKE_INSTALL_NAME_DIR "@rpath")
set(CMAKE_INSTALL_NAME_DIR "@rpath")
endif()
endif() endif()
set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}}) set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
add_library(${_TARGET} ${_PREF} ${_ARGS}) add_library(${_TARGET} ${_PREF} ${_ARGS})
@@ -410,9 +408,7 @@ macro(qt_add_library _NAME)
#message("add lib: \"${_TARGET}\"") #message("add lib: \"${_TARGET}\"")
if(APPLE) if(APPLE)
if(CMAKE_CROSSCOMPILING) set(CMAKE_INSTALL_NAME_DIR "${_PREV_CIND}")
set(CMAKE_INSTALL_NAME_DIR "${_PREV_CIND}")
endif()
endif() endif()
# # 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)