From 93f54742b9c34b0c89dc59098e0bed7af6decf93 Mon Sep 17 00:00:00 2001 From: Adam Treat Date: Sun, 23 Apr 2023 22:05:24 -0400 Subject: [PATCH] Small fixes. --- CMakeLists.txt | 5 +++++ qml/Theme.qml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 153fc1e0..eeb78b11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,8 @@ message(STATUS "Qt 6 root directory: ${Qt6_ROOT_DIR}") set(LLAMA_BUILD_EXAMPLES ON CACHE BOOL "llama: build examples" FORCE) set(BUILD_SHARED_LIBS ON FORCE) +#set(LLAMA_AVX2 OFF "llama: enable AVX2" FORCE) + add_subdirectory(llama.cpp) qt_add_executable(chat @@ -119,6 +121,7 @@ if(NOT (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_HOST_SYSTEM_PROCESSOR endif() install(TARGETS chat DESTINATION bin COMPONENT ${COMPONENT_NAME_MAIN}) +install(TARGETS llama DESTINATION lib COMPONENT ${COMPONENT_NAME_MAIN}) set(CPACK_GENERATOR "IFW") set(CPACK_VERBATIM_VARIABLES YES) @@ -150,6 +153,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES Darwin) set(CPACK_IFW_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/favicon.icns") set(CPACK_PACKAGE_FILE_NAME "${COMPONENT_NAME_MAIN}-installer-darwin") set(CPACK_IFW_TARGET_DIRECTORY "@HomeDir@/Applications/${COMPONENT_NAME_MAIN}") + set(CPACK_BUNDLE_NAME ${COMPONENT_NAME_MAIN}) + set(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/favicon.icns") endif() set(CPACK_PACKAGE_INSTALL_DIRECTORY ${COMPONENT_NAME_MAIN}) diff --git a/qml/Theme.qml b/qml/Theme.qml index 7b179941..48cf515f 100644 --- a/qml/Theme.qml +++ b/qml/Theme.qml @@ -12,5 +12,5 @@ QtObject { property color dialogBorder: "#d1d5db" property color userColor: "#ec86bf" property color assistantColor: "#10a37f" - property real fontSizeLarge: Font.pixelSize + property real fontSizeLarge: Qt.application.font.pixelSize }