Skip to content

Commit cddd5a8

Browse files
committed
fix(build): update ggml package config for whisper.cpp to use new directory structure
1 parent b565796 commit cddd5a8

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,13 @@ build/llama.cpp.stamp:
241241

242242
build/whisper.cpp.stamp: build/llama.cpp.stamp
243243
# Create ggml package config for whisper.cpp to find
244-
mkdir -p $(BUILD_WHISPER)/ggml-config
245-
echo 'set(ggml_FOUND TRUE)' > $(BUILD_WHISPER)/ggml-config/ggml-config.cmake
246-
echo 'set(ggml_INCLUDE_DIRS "$(shell pwd)/$(BUILD_LLAMA)/ggml/src")' >> $(BUILD_WHISPER)/ggml-config/ggml-config.cmake
247-
echo 'set(ggml_LIBRARIES "$(shell pwd)/$(BUILD_LLAMA)/ggml/src/libggml.a;$(shell pwd)/$(BUILD_LLAMA)/ggml/src/libggml-base.a;$(shell pwd)/$(BUILD_LLAMA)/ggml/src/libggml-cpu.a")' >> $(BUILD_WHISPER)/ggml-config/ggml-config.cmake
248-
echo 'add_library(ggml::ggml INTERFACE IMPORTED)' >> $(BUILD_WHISPER)/ggml-config/ggml-config.cmake
249-
echo 'set_target_properties(ggml::ggml PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "$${ggml_INCLUDE_DIRS}" INTERFACE_LINK_LIBRARIES "$${ggml_LIBRARIES}")' >> $(BUILD_WHISPER)/ggml-config/ggml-config.cmake
250-
cmake -B $(BUILD_WHISPER) $(WHISPER_OPTIONS) -DCMAKE_MODULE_PATH=$(shell pwd)/$(BUILD_WHISPER)/ggml-config $(WHISPER_DIR)
244+
mkdir -p $(BUILD_WHISPER)/ggml-config/lib/cmake/ggml
245+
echo 'set(ggml_FOUND TRUE)' > $(BUILD_WHISPER)/ggml-config/lib/cmake/ggml/ggmlConfig.cmake
246+
echo 'set(ggml_INCLUDE_DIRS "$(shell pwd)/$(BUILD_LLAMA)/ggml/src")' >> $(BUILD_WHISPER)/ggml-config/lib/cmake/ggml/ggmlConfig.cmake
247+
echo 'set(ggml_LIBRARIES "$(shell pwd)/$(BUILD_LLAMA)/ggml/src/libggml.a;$(shell pwd)/$(BUILD_LLAMA)/ggml/src/libggml-base.a;$(shell pwd)/$(BUILD_LLAMA)/ggml/src/libggml-cpu.a")' >> $(BUILD_WHISPER)/ggml-config/lib/cmake/ggml/ggmlConfig.cmake
248+
echo 'add_library(ggml::ggml INTERFACE IMPORTED)' >> $(BUILD_WHISPER)/ggml-config/lib/cmake/ggml/ggmlConfig.cmake
249+
echo 'set_target_properties(ggml::ggml PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "$${ggml_INCLUDE_DIRS}" INTERFACE_LINK_LIBRARIES "$${ggml_LIBRARIES}")' >> $(BUILD_WHISPER)/ggml-config/lib/cmake/ggml/ggmlConfig.cmake
250+
cmake -B $(BUILD_WHISPER) $(WHISPER_OPTIONS) -DCMAKE_PREFIX_PATH=$(shell pwd)/$(BUILD_WHISPER)/ggml-config $(WHISPER_DIR)
251251
cmake --build $(BUILD_WHISPER) --config Release $(WHISPER_ARGS) $(ARGS)
252252
touch $@
253253

0 commit comments

Comments
 (0)