git-svn-id: svn://db.shs.com.ru/libs@788 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -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})
|
||||
|
||||
Reference in New Issue
Block a user