git-svn-id: svn://db.shs.com.ru/libs@829 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -362,6 +362,10 @@ macro(qt_add_executable _NAME)
|
|||||||
if(APPLE)
|
if(APPLE)
|
||||||
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")
|
||||||
|
else()
|
||||||
|
if(NOT WIN32)
|
||||||
|
set(CMAKE_INSTALL_RPATH "\$ORIGIN/lib")
|
||||||
|
endif()
|
||||||
endif()
|
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})
|
||||||
@@ -400,6 +404,10 @@ macro(qt_add_library _NAME)
|
|||||||
if(APPLE)
|
if(APPLE)
|
||||||
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")
|
||||||
|
else()
|
||||||
|
if(NOT WIN32)
|
||||||
|
set(CMAKE_INSTALL_RPATH "\$ORIGIN/lib")
|
||||||
|
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})
|
||||||
|
|||||||
Reference in New Issue
Block a user