Skip to content

Make sure ORT lib location is known to cmake #358

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

Merged
merged 11 commits into from
Oct 9, 2024
Merged

Make sure ORT lib location is known to cmake #358

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f934589
make sure ORT lib location is known to cmake
20DM Oct 8, 2024
1fee84d
trigger CI
20DM Oct 8, 2024
4ba5904
trigger CI
20DM Oct 8, 2024
2995a95
add debug info
20DM Oct 8, 2024
c9d3e6b
reinstate symlink
20DM Oct 8, 2024
8d356be
of course MacOS and Linux will do it differently
20DM Oct 8, 2024
4a8e4f7
remove debug info
20DM Oct 8, 2024
c380b94
Merge branch 'development' into cg_onnxrt_patch
20DM Oct 9, 2024
f803bf3
version bump
20DM Oct 9, 2024
5baffb7
bump version
20DM Oct 9, 2024
2a821d2
more version bumps
20DM Oct 9, 2024
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
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,12 @@ jobs:
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: |
export LD_LIBRARY_PATH=${{github.workspace}}/local/lib:${{github.workspace}}/local/external/lib:${LD_LIBRARY_PATH}
OLDSOPT=`ls ${{github.workspace}}/local/lib/libsopt*`
NEWSOPT=${OLDSOPT%.*}
if [[ $OLDSOPT == *"dylib"* ]]; then
NEWSOPT=${NEWSOPT%.*}.${OLDSOPT##*.}
fi
ln -s $OLDSOPT $NEWSOPT
ctest -C ${{env.BUILD_TYPE}} --output-on-failure

doc:
Expand Down
4 changes: 4 additions & 0 deletions cmake_files/dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ find_package(Boost COMPONENTS system filesystem REQUIRED)

find_package(yaml-cpp REQUIRED)

if (onnxrt)
find_package(onnxruntime REQUIRED)
endif()

find_package(sopt REQUIRED)
set(PURIFY_ONNXRT FALSE)
if (onnxrt)
Expand Down
Loading