Skip to content

Commit 8d000e8

Browse files
committed
Fix OpenBLAS dependencies and linking for Ubuntu package
1 parent b2c54e1 commit 8d000e8

5 files changed

Lines changed: 9 additions & 5 deletions

File tree

.github/scripts/.Aptfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package 'cmake'
22
package 'ccache'
33
package 'git'
44
package 'jq'
5+
package 'libopenblas-dev'
6+
package 'libopenblas-openmp-dev'
7+
package 'libsimde-dev'
58
package 'ninja-build', bin: 'ninja'
69
package 'pkg-config'
7-
package 'libopenblas-dev'

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.31...4.12)
1+
cmake_minimum_required(VERSION 3.28...4.12)
22

33
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake" NO_POLICY_SCOPE)
44

@@ -68,7 +68,6 @@ if(WIN32)
6868
elseif(UNIX AND NOT APPLE)
6969
set(BLA_VENDOR OpenBLAS)
7070
find_package(BLAS REQUIRED)
71-
target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ${BLAS_LIBRARIES})
7271
endif()
7372

7473
include(cmake/BuildWhispercpp.cmake)

cmake/BuildCTranslate2.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,6 @@ else()
146146
set_target_properties(ct2::ct2 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
147147

148148
add_library(ct2 INTERFACE)
149-
target_link_libraries(ct2 INTERFACE ct2::ct2 cpu_features)
149+
target_link_libraries(ct2 INTERFACE ct2::ct2 cpu_features ${BLAS_LIBRARIES})
150150

151151
endif()

cmake/BuildWhispercpp.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,3 +160,6 @@ if(APPLE)
160160
target_link_libraries(Whispercpp INTERFACE "-framework Accelerate -framework CoreML -framework Metal")
161161
target_link_libraries(Whispercpp INTERFACE Whispercpp::GGML Whispercpp::CoreML)
162162
endif(APPLE)
163+
if(UNIX AND NOT APPLE)
164+
target_link_libraries(Whispercpp INTERFACE ${BLAS_LIBRARIES})
165+
endif()

cmake/common/bootstrap.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.31...4.12)
1+
cmake_minimum_required(VERSION 3.28...4.12)
22

33
include_guard(GLOBAL)
44

0 commit comments

Comments
 (0)