SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@934 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-09 13:29:13 +00:00
parent a062868890
commit c7bccaade8
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@@ -77,12 +77,12 @@ if(MINGW)
list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIB}) list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIB})
else() else()
if(APPLE) if(APPLE)
set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks;@executable_path/lib;@loader_path/../lib")
set(CMAKE_MACOSX_RPATH 1)
if(NOT CMAKE_CROSSCOMPILING) if(NOT CMAKE_CROSSCOMPILING)
include_directories(/usr/local/include) include_directories(/usr/local/include)
link_directories(/usr/local/lib) link_directories(/usr/local/lib)
endif() endif()
set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks;@executable_path/lib;@loader_path/../lib")
set(CMAKE_MACOSX_RPATH 1)
else() else()
set(CMAKE_INSTALL_RPATH "\$ORIGIN/lib") set(CMAKE_INSTALL_RPATH "\$ORIGIN/lib")
endif() endif()
@@ -627,6 +627,8 @@ endif()
message(STATUS "Building PIP modules: ${PIP_LIBS_TARGETS}") message(STATUS "Building PIP modules: ${PIP_LIBS_TARGETS}")
if(DEFINED LIBPROJECT) if(DEFINED LIBPROJECT)
set(PIP_LIBS_TARGETS ${PIP_LIBS_TARGETS} PARENT_SCOPE) set(PIP_LIBS_TARGETS ${PIP_LIBS_TARGETS} PARENT_SCOPE)
list(APPEND _ALL_TARGETS ${PIP_LIBS_TARGETS})
set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
endif() endif()
if(NOT PIP_FREERTOS) if(NOT PIP_FREERTOS)
foreach(LIB_ ${LIBS_STATUS}) foreach(LIB_ ${LIBS_STATUS})
@@ -638,6 +640,18 @@ if(NOT PIP_FREERTOS)
endif() endif()
# Apple crosscompiling rpath patch
if (APPLE AND CMAKE_CROSSCOMPILING AND CMAKE_MACOSX_RPATH)
foreach(_T ${PIP_LIBS_TARGETS})
foreach(_RP ${CMAKE_INSTALL_RPATH})
add_custom_command(TARGET ${_T} POST_BUILD
COMMAND "${CMAKE_INSTALL_NAME_TOOL}"
"-add_rpath" "${_RP}"
"$<TARGET_FILE_DIR:${_T}>/$<TARGET_FILE_NAME:${_T}>")
endforeach()
endforeach()
endif()
# #
# Build Documentation # Build Documentation
# #