Skip to content

Updates for Linux and GTests #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joeloftusdev wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Updates for Linux and GTests #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50cc6f6
Upgraded CMake, GTest versions and added condition for download of mo…
admleggett Oct 15, 2024
7fdef77
Update circular_frame_buffer.h
joeloftusdev Jan 5, 2025
5ffa9e7
Update circular_frame_buffer.h
joeloftusdev Jan 9, 2025
883302e
Update circular_frame_buffer.h
joeloftusdev Jan 9, 2025
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
build
docs/build

# Ignore CLion files
cmake-build-debug
.idea
7 changes: 5 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.28.1)

project(spleeter++)

set(CMAKE_CXX_STANDARD 14)

option(spleeter_enable_tests "Enable unit tests" ON)
option(spleeter_download_models "Download the models from the spleeter repository" ON)
option(spleeter_regenerate_models "Build the models from deezer/spleeter repository (requires conda)" OFF)
option(spleeter_enable_filter "Enable the filter interface (for online processing)" ON)
option(spleeter_enable_high_resolution "Process the spectrum up the 16KHz" OFF)
Expand Down Expand Up @@ -36,7 +37,9 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
if (${spleeter_regenerate_models})
include(add_spleeter)
else()
include(add_spleeter_models)
if(${spleeter_download_models})
include(add_spleeter_models)
endif()
endif()
include(add_eigen)
include(add_tensorflow)
Expand Down
3 changes: 2 additions & 1 deletion cmake/add_googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ include(FetchContent)
FetchContent_Declare(
googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.8.0
#GIT_TAG release-1.8.0
GIT_TAG v1.14.0
)

FetchContent_GetProperties(googletest)
Expand Down
4 changes: 4 additions & 0 deletions src/artff/buffer/circular_frame_buffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
#include <vector>
#include <complex>

#ifdef __linux__
#include <cstdint>
#endif

namespace artff {
class CircularFrameBuffer {
public:
Expand Down