diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 76c363ad..1ca88030 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -71,7 +71,6 @@ jobs: export PATH=$PATH:$HOME/Qt/Tools/QtInstallerFramework/4.8/bin ~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \ -S ../gpt4all-chat -B . -G Ninja \ - -DCMAKE_INSTALL_PREFIX=~/install \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH:PATH=~/Qt/6.5.1/macos/lib/cmake \ -DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \ diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt index 257338b9..b763f491 100644 --- a/gpt4all-chat/CMakeLists.txt +++ b/gpt4all-chat/CMakeLists.txt @@ -98,6 +98,10 @@ message(STATUS "Qt 6 root directory: ${Qt6_ROOT_DIR}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "..." FORCE) +endif() + add_subdirectory(deps) add_subdirectory(../gpt4all-backend llmodel) @@ -398,10 +402,6 @@ endif() set(COMPONENT_NAME_MAIN ${PROJECT_NAME}) -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "..." FORCE) -endif() - install(TARGETS chat DESTINATION bin COMPONENT ${COMPONENT_NAME_MAIN}) install(