Fixed RPATH issue for brew (#18418)
This commit is contained in:
@@ -170,8 +170,6 @@ endif()
|
||||
|
||||
include(packaging/packaging)
|
||||
|
||||
set(CMAKE_SKIP_INSTALL_RPATH ON)
|
||||
|
||||
if(APPLE)
|
||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
|
||||
|
||||
|
||||
@@ -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()
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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>)
|
||||
#
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user