Added support of universal2 OSX binaries (#13093)
* Added support of universal2 OSX binaries * Fixed openvino wheel for OSX: different library name structure
This commit is contained in:
1 parent
939f1e77f0
commit
b6ce6f4d39
14 files changed
+70
-40
No files matched your search
Vendored
+8
-2
@@ -92,8 +92,14 @@ if(ENABLE_SYSTEM_PUGIXML)
|
||||
get_target_property(imported_config ${pugixml_target} IMPORTED_CONFIGURATIONS)
|
||||
get_target_property(pugixml_loc ${pugixml_target} IMPORTED_LOCATION_${imported_config})
|
||||
get_filename_component(pugixml_dir "${pugixml_loc}" DIRECTORY)
|
||||
get_target_property(pugixml_soname_loc ${pugixml_target} IMPORTED_SONAME_${imported_config})
|
||||
set(pugixml_libs "${pugixml_loc}" "${pugixml_dir}/${pugixml_soname_loc}")
|
||||
get_filename_component(name_we "${pugixml_loc}" NAME_WE)
|
||||
# grab all tbb files matching pattern
|
||||
file(GLOB pugixml_files "${pugixml_dir}/${name_we}.*")
|
||||
foreach(pugixml_file IN LISTS pugixml_files)
|
||||
if(pugixml_file MATCHES "^.*\.${CMAKE_SHARED_LIBRARY_SUFFIX}(\.[0-9]+)*$")
|
||||
list(APPEND pugixml_libs "${pugixml_file}")
|
||||
endif()
|
||||
endforeach()
|
||||
elseif(target_type STREQUAL "INTERFACE_LIBRARY")
|
||||
get_target_property(pugixml_loc ${pugixml_target} INTERFACE_LINK_LIBRARIES)
|
||||
file(GLOB pugixml_libs_all "${pugixml_loc}.*")
|
||||
|
||||
Vendored
+2
-3
@@ -26,9 +26,8 @@ set(protobuf_BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
|
||||
set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
|
||||
set(protobuf_WITH_ZLIB OFF CACHE BOOL "Build with zlib support" FORCE)
|
||||
|
||||
if(CMAKE_CROSSCOMPILING OR
|
||||
(CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64" AND AARCH64) OR
|
||||
(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64" AND X86_64))
|
||||
# note: HOST_AARCH64 AND X86_64 are not handled for Apple explicitly, becuase it can work via Rosetta
|
||||
if(CMAKE_CROSSCOMPILING OR (APPLE AND (HOST_X86_64 AND AARCH64)) )
|
||||
set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE)
|
||||
else()
|
||||
set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
|
||||
|
||||
Reference in new issue
Block a user