Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.

feat: Reduce redundant build steps #487

Merged
merged 2 commits into from
Apr 9, 2024
Merged

feat: Reduce redundant build steps #487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56dcc0e
Draft commit
CameronNg Apr 6, 2024
e48bd59
Update add_subdirectory(llava) position
CameronNg Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
project(nitro CXX)
project(nitro C CXX)

include(CheckIncludeFileCXX)

Expand All @@ -16,9 +16,6 @@ else()
set(CMAKE_CXX_STANDARD 14)
endif()

# llama cpp server need llava example to work, this is for llama cpp server
set(LLAMA_BUILD_EXAMPLES ON)

set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(OPENSSL_USE_STATIC_LIBS TRUE)
Expand Down Expand Up @@ -47,6 +44,7 @@ endif()

add_compile_definitions(NITRO_VERSION="${NITRO_VERSION}")

add_subdirectory(llama.cpp/examples/llava)
add_subdirectory(llama.cpp)
add_subdirectory(whisper.cpp)

Expand Down