LLM inference in C/C++
C++ ggml
cmake : add config version support (ggml/1582)
Daniel Bevenius13fd0bb55ed3
diff --git a/ggml/CMakeLists.txt b/ggml/CMakeLists.txtindex 1b1de6b7d4..b6843578b7 100644--- a/ggml/CMakeLists.txt+++ b/ggml/CMakeLists.txt@@ -402,7 +402,7 @@ configure_package_config_file(GGML_BIN_INSTALL_DIR)write_basic_package_version_file(- ${CMAKE_CURRENT_BINARY_DIR}/ggml-version.cmake+ ${CMAKE_CURRENT_BINARY_DIR}/ggml-config-version.cmakeVERSION ${GGML_INSTALL_VERSION}COMPATIBILITY SameMajorVersion)@@ -414,7 +414,7 @@ message(STATUS "ggml version: ${GGML_INSTALL_VERSION}")message(STATUS "ggml commit: ${GGML_BUILD_COMMIT}")install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ggml-config.cmake- ${CMAKE_CURRENT_BINARY_DIR}/ggml-version.cmake+ ${CMAKE_CURRENT_BINARY_DIR}/ggml-config-version.cmakeDESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ggml)if (MSVC)diff --git a/ggml/cmake/ggml-config.cmake.in b/ggml/cmake/ggml-config.cmake.inindex 23a3066f56..abe17804a5 100644--- a/ggml/cmake/ggml-config.cmake.in+++ b/ggml/cmake/ggml-config.cmake.in@@ -113,6 +113,7 @@ set_and_check(GGML_LIB_DIR "@PACKAGE_GGML_LIB_INSTALL_DIR@")if(NOT TARGET ggml::ggml)find_package(Threads REQUIRED)+ unset(GGML_LIBRARY CACHE)find_library(GGML_LIBRARY ggmlREQUIREDHINTS ${GGML_LIB_DIR}@@ -121,8 +122,10 @@ if(NOT TARGET ggml::ggml)add_library(ggml::ggml UNKNOWN IMPORTED)set_target_properties(ggml::ggmlPROPERTIES- IMPORTED_LOCATION "${GGML_LIBRARY}")+ IMPORTED_LOCATION "${GGML_LIBRARY}"+ INTERFACE_INCLUDE_DIRECTORIES "${GGML_INCLUDE_DIR}")+ unset(GGML_BASE_LIBRARY CACHE)find_library(GGML_BASE_LIBRARY ggml-baseREQUIREDHINTS ${GGML_LIB_DIR}@@ -132,6 +135,7 @@ if(NOT TARGET ggml::ggml)set_target_properties(ggml::ggml-basePROPERTIESIMPORTED_LOCATION "${GGML_BASE_LIBRARY}"+ INTERFACE_INCLUDE_DIRECTORIES "${GGML_INCLUDE_DIR}"INTERFACE_LINK_LIBRARIES "${GGML_BASE_INTERFACE_LINK_LIBRARIES}")set(_ggml_all_targets "")@@ -140,6 +144,7 @@ if(NOT TARGET ggml::ggml)string(REPLACE "-" "_" _ggml_backend_pfx "${_ggml_backend}")string(TOUPPER "${_ggml_backend_pfx}" _ggml_backend_pfx)+ unset(${_ggml_backend_pfx}_LIBRARY CACHE)find_library(${_ggml_backend_pfx}_LIBRARY ${_ggml_backend}REQUIREDHINTS ${GGML_LIB_DIR}