Skip to content

Commit c990f3d

Browse files
authored
Merge pull request #59 from jesusmb1995/jmb/build_dl20
QVAC-7519: Fix dynamic libs path with vcpkg install
2 parents 8e9130a + 58e64df commit c990f3d

File tree

2 files changed

+25
-21
lines changed

2 files changed

+25
-21
lines changed

.github/workflows/build.yml

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -346,11 +346,12 @@ jobs:
346346
id: checkout
347347
uses: actions/checkout@v4
348348

349-
- name: ccache
350-
uses: ggml-org/[email protected]
351-
with:
352-
key: ubuntu-latest-cmake-rpc
353-
evict-old-files: 1d
349+
# Reduce false pass/failure on CI
350+
# - name: ccache
351+
# uses: ggml-org/[email protected]
352+
# with:
353+
# key: ubuntu-latest-cmake-rpc
354+
# evict-old-files: 1d
354355

355356
- name: Dependencies
356357
id: depends
@@ -379,11 +380,12 @@ jobs:
379380
id: checkout
380381
uses: actions/checkout@v4
381382

382-
- name: ccache
383-
uses: ggml-org/[email protected]
384-
with:
385-
key: ubuntu-22-cmake-vulkan
386-
evict-old-files: 1d
383+
# Reduce false pass/failure on CI
384+
# - name: ccache
385+
# uses: ggml-org/[email protected]
386+
# with:
387+
# key: ubuntu-22-cmake-vulkan
388+
# evict-old-files: 1d
387389

388390
- name: Dependencies
389391
id: depends
@@ -416,11 +418,12 @@ jobs:
416418
id: checkout
417419
uses: actions/checkout@v4
418420

419-
- name: ccache
420-
uses: ggml-org/[email protected]
421-
with:
422-
key: ubuntu-22-cmake-webgpu
423-
evict-old-files: 1d
421+
# Reduce false pass/failure on CI
422+
# - name: ccache
423+
# uses: ggml-org/[email protected]
424+
# with:
425+
# key: ubuntu-22-cmake-webgpu
426+
# evict-old-files: 1d
424427

425428
- name: Vulkan SDK Dependencies
426429
id: vulkan-depends
@@ -473,11 +476,12 @@ jobs:
473476
sudo apt-get update
474477
sudo apt-get install -y build-essential git cmake rocblas-dev hipblas-dev libcurl4-openssl-dev
475478
476-
- name: ccache
477-
uses: ggml-org/[email protected]
478-
with:
479-
key: ubuntu-22-cmake-hip
480-
evict-old-files: 1d
479+
# Reduce false pass/failure on CI
480+
# - name: ccache
481+
# uses: ggml-org/[email protected]
482+
# with:
483+
# key: ubuntu-22-cmake-hip
484+
# evict-old-files: 1d
481485

482486
- name: Build with native CMake HIP support
483487
id: cmake_build

ggml/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ function(ggml_add_backend_library backend)
244244
else()
245245
install(TARGETS ${backend}
246246
EXPORT ggml-targets
247-
LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR}
247+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
248248
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
249249
endif()
250250
else()

0 commit comments

Comments
 (0)