From c7bccaade8855b01888fdcdb77c11d40442d7a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Mon, 9 Mar 2020 13:29:13 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@934 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a2a44c3..a44d9ffd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,12 +77,12 @@ if(MINGW) list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIB}) else() if(APPLE) - set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks;@executable_path/lib;@loader_path/../lib") - set(CMAKE_MACOSX_RPATH 1) if(NOT CMAKE_CROSSCOMPILING) include_directories(/usr/local/include) link_directories(/usr/local/lib) endif() + set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks;@executable_path/lib;@loader_path/../lib") + set(CMAKE_MACOSX_RPATH 1) else() set(CMAKE_INSTALL_RPATH "\$ORIGIN/lib") endif() @@ -627,6 +627,8 @@ endif() message(STATUS "Building PIP modules: ${PIP_LIBS_TARGETS}") if(DEFINED LIBPROJECT) set(PIP_LIBS_TARGETS ${PIP_LIBS_TARGETS} PARENT_SCOPE) + list(APPEND _ALL_TARGETS ${PIP_LIBS_TARGETS}) + set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE) endif() if(NOT PIP_FREERTOS) foreach(LIB_ ${LIBS_STATUS}) @@ -638,6 +640,18 @@ if(NOT PIP_FREERTOS) 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}" + "$/$") + endforeach() + endforeach() +endif() + # # Build Documentation #