Skip to content

Commit 8688e8d

Browse files
committed
conditionally include build type into archive
1 parent 0718392 commit 8688e8d

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

.github/workflows/genai_package.yml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: genai_package
22
on: pull_request
33
jobs:
44
ubuntu_genai_package:
5-
if: false
65
runs-on: ubuntu-20.04
76
steps:
87
- uses: actions/checkout@v4

src/cpp/CMakeLists.txt

+21-16
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,30 @@ add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
6868

6969
install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION . COMPONENT core_genai RUNTIME DESTINATION . COMPONENT core_genai)
7070

71-
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCH_FOLDER)
72-
if(X86_64)
73-
set(ARCH_FOLDER intel64)
74-
elseif(X86)
75-
set(ARCH_FOLDER ia32)
76-
elseif(MSVC AND ARM)
77-
set(ARCH_FOLDER arm)
78-
elseif((MSVC OR APPLE) AND AARCH64)
79-
set(ARCH_FOLDER arm64)
80-
elseif(UNIVERSAL2)
81-
set(ARCH_FOLDER universal2)
82-
elseif(ARCH_FOLDER STREQUAL "x86_64" OR ARCH_FOLDER STREQUAL "amd64" # Windows detects Intel's 64-bit CPU as AMD64
71+
# - Windows: `<openvino_dir>\runtime\bin\intel64\Release\`
72+
# - MacOS_x86: `<openvino_dir>/runtime/lib/intel64/Release`
73+
# - MacOS_arm64: `<openvino_dir>/runtime/lib/arm64/Release/`
74+
# - Linux_x86: `<openvino_dir>/runtime/lib/intel64/`
75+
# - Linux_arm64: `<openvino_dir>/runtime/lib/aarch64/`
76+
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCH_DIR)
77+
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
78+
set(ARCH_DIR intel64)
79+
elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*|ARM64.*)")
80+
if(APPLE)
81+
set(ARCH_DIR "arm64")
82+
else()
83+
set(ARCH_DIR "aarch64")
84+
endif()
85+
elseif(ARCH_DIR STREQUAL "x86_64" OR ARCH_DIR STREQUAL "amd64" # Windows detects Intel's 64-bit CPU as AMD64
8386
OR CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
84-
set(ARCH_FOLDER intel64)
87+
set(ARCH_DIR intel64)
88+
endif()
89+
if(MSVC OR APPLE)
90+
set(ARCH_DIR ${ARCH_DIR}/${CMAKE_BUILD_TYPE})
8591
endif()
8692
install(TARGETS ${TARGET_NAME} EXPORT openvino_genaiTargets
87-
LIBRARY DESTINATION runtime/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} COMPONENT core_genai_dev
88-
ARCHIVE DESTINATION runtime/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} COMPONENT core_genai_dev
89-
RUNTIME DESTINATION runtime/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} COMPONENT core_genai_dev
93+
LIBRARY DESTINATION runtime/lib/${ARCH_DIR} COMPONENT core_genai_dev
94+
RUNTIME DESTINATION runtime/bin/${ARCH_DIR} COMPONENT core_genai_dev
9095
INCLUDES DESTINATION runtime/include)
9196
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION runtime/include COMPONENT core_genai_dev)
9297
install(EXPORT openvino_genaiTargets FILE openvino_genaiTargets.cmake NAMESPACE openvino:: DESTINATION runtime/cmake)

0 commit comments

Comments
 (0)