Skip to content

Commit

Permalink
Fixed RPATH issue for brew (openvinotoolkit#18418)
Browse files Browse the repository at this point in the history
  • Loading branch information
ilya-lavrenov authored Jul 7, 2023
1 parent d571ab3 commit df2ed95
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
2 changes: 0 additions & 2 deletions cmake/developer_package/IEDevScriptsConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ endif()

include(packaging/packaging)

set(CMAKE_SKIP_INSTALL_RPATH ON)

if(APPLE)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)

Expand Down
9 changes: 5 additions & 4 deletions cmake/developer_package/packaging/common-libraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ macro(ov_common_libraries_cpack_set_dirs)
set(IE_CPACK_LIBRARY_PATH ${OV_CPACK_LIBRARYDIR})
set(IE_CPACK_RUNTIME_PATH ${OV_CPACK_RUNTIMEDIR})
set(IE_CPACK_ARCHIVE_PATH ${OV_CPACK_ARCHIVEDIR})

if(CPACK_GENERATOR STREQUAL "BREW")
set(CMAKE_SKIP_INSTALL_RPATH OFF)
endif()
endmacro()

ov_common_libraries_cpack_set_dirs()
Expand Down Expand Up @@ -123,3 +119,8 @@ macro(ov_define_component_include_rules)
endmacro()

ov_define_component_include_rules()

if(CPACK_GENERATOR STREQUAL "BREW")
# brew relies on RPATH
set(CMAKE_SKIP_INSTALL_RPATH OFF)
endif()
3 changes: 3 additions & 0 deletions cmake/developer_package/packaging/debian/debian.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@ macro(ov_debian_specific_settings)
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)
endif()
endif()

# we don't need RPATHs, because libraries are search by standard paths
set(CMAKE_SKIP_INSTALL_RPATH ON)
endmacro()

ov_debian_specific_settings()
Expand Down
3 changes: 3 additions & 0 deletions cmake/developer_package/packaging/packaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

include(CPackComponent)

# we don't need RPATHs, because setupvars.sh is used
set(CMAKE_SKIP_INSTALL_RPATH ON)

#
# ov_install_static_lib(<target> <comp>)
#
Expand Down
3 changes: 3 additions & 0 deletions cmake/developer_package/packaging/rpm/rpm.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ macro(ov_rpm_specific_settings)
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)
endif()
endif()

# we don't need RPATHs, because libraries are search by standard paths
set(CMAKE_SKIP_INSTALL_RPATH ON)
endmacro()

ov_rpm_specific_settings()
Expand Down

0 comments on commit df2ed95

Please sign in to comment.