Skip to content

Prefer using CMake path variables where available #2208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jaeyoonjung wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prefer using CMake path variables where available #2208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions cmake/ortlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

# For the installation directory variables
include(GNUInstallDirs)

if(USE_WINML)
message(STATUS "----- Building with WinML support ----- ")

Expand Down Expand Up @@ -68,12 +71,20 @@ if(ORT_HOME)
elseif (IOS OR MAC_CATALYST)
set(ORT_HEADER_DIR ${ORT_HOME}/Headers)
set(ORT_LIB_DIR ${ORT_HOME}/)
elseif (CMAKE_SYSTEM_NAME MATCHES "AIX")
set(ORT_HEADER_DIR ${ORT_HOME}/include/onnxruntime)
set(ORT_LIB_DIR ${ORT_HOME}/lib)
else()
set(ORT_HEADER_DIR ${ORT_HOME}/include)
set(ORT_LIB_DIR ${ORT_HOME}/lib)
if (NOT "${CMAKE_INSTALL_INCLUDEDIR}" STREQUAL "" AND EXISTS ${ORT_HOME}/${CMAKE_INSTALL_INCLUDEDIR})
set(ORT_HEADER_DIR ${ORT_HOME}/${CMAKE_INSTALL_INCLUDEDIR})
else()
set(ORT_HEADER_DIR ${ORT_HOME}/include)
endif()
if (CMAKE_SYSTEM_NAME MATCHES "AIX")
set(ORT_HEADER_DIR ${ORT_HEADER_DIR}/onnxruntime)
endif()
if (NOT "${CMAKE_INSTALL_LIBDIR}" STREQUAL "" AND EXISTS ${ORT_HOME}/${CMAKE_INSTALL_LIBDIR})
set(ORT_LIB_DIR ${ORT_HOME}/${CMAKE_INSTALL_LIBDIR})
else()
set(ORT_LIB_DIR ${ORT_HOME}/lib)
endif()
endif()
else()
# If ORT_HOME is not specified, download the onnxruntime headers and libraries from the nightly feed
Expand Down
19 changes: 11 additions & 8 deletions cmake/package.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# For the installation directory variables
include(GNUInstallDirs)

set(ONNXRUNTIME_GENAI_PUBLIC_HEADERS
"${PROJECT_SOURCE_DIR}/src/ort_genai_c.h;${PROJECT_SOURCE_DIR}/src/ort_genai.h"
)
Expand All @@ -8,23 +11,23 @@ set_target_properties(
)
install(TARGETS
onnxruntime-genai
LIBRARY DESTINATION lib
RUNTIME DESTINATION lib
ARCHIVE DESTINATION lib
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION include
FRAMEWORK DESTINATION ${CMAKE_INSTALL_BINDIR}
)
if(USE_CUDA OR USE_TRT_RTX)
install(TARGETS
onnxruntime-genai-cuda
LIBRARY DESTINATION lib
RUNTIME DESTINATION lib
ARCHIVE DESTINATION lib
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
endif()

if (WIN32)
install(FILES $<TARGET_PDB_FILE:onnxruntime-genai> DESTINATION lib CONFIGURATIONS RelWithDebInfo Debug)
install(FILES $<TARGET_PDB_FILE:onnxruntime-genai> DESTINATION ${CMAKE_INSTALL_LIBDIR} CONFIGURATIONS RelWithDebInfo Debug)
endif()
set(CPACK_PACKAGE_VENDOR "Microsoft")
set(CPACK_PACKAGE_NAME "onnxruntime-genai")
Expand Down Expand Up @@ -144,4 +147,4 @@ if(BUILD_APPLE_FRAMEWORK)
copy_if_different ${h_} ${STATIC_FRAMEWORK_HEADER_DIR}/${HEADER_NAME_})
endforeach()

endif()
endif()
Loading