Skip to content

Fix cmake deprecation failure coming from 3rd party #279

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

Merged
sovrasov merged 3 commits into from
Apr 3, 2025
Merged

Fix cmake deprecation failure coming from 3rd party #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5259d8c
Update json commit
sovrasov Apr 3, 2025
c253f72
Align cmake min version across the project
sovrasov Apr 3, 2025
4491044
Update cmake in tests
sovrasov Apr 3, 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: 3 additions & 1 deletion src/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ find_package(OpenVINO REQUIRED
COMPONENTS Runtime Threading)

include(FetchContent)
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
FetchContent_Declare(json GIT_REPOSITORY https://github.com/nlohmann/json.git
GIT_TAG d41ca94fa85d5119852e2f7a3f94335cc7cb0486 # PR #4709, fixes cmake deprecation warnings
)
FetchContent_MakeAvailable(json)

file(GLOB MODELS_SOURCES ./models/src/*.cpp)
Expand Down
4 changes: 3 additions & 1 deletion tests/cpp/accuracy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ endif()
include(CMakeParseArguments)
include(FetchContent)

FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz)
FetchContent_Declare(json GIT_REPOSITORY https://github.com/nlohmann/json.git
GIT_TAG d41ca94fa85d5119852e2f7a3f94335cc7cb0486 # PR #4709, fixes cmake deprecation warnings
)
FetchContent_Declare(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG a7f443b80b105f940225332ed3c31f2790092f47 # latest main
Expand Down
2 changes: 1 addition & 1 deletion tests/cpp/cmake/common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
#

cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.26)

macro(add_test)
set(oneValueArgs NAME OPENCV_VERSION_REQUIRED)
Expand Down
4 changes: 3 additions & 1 deletion tests/cpp/precommit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ endif()
include(CMakeParseArguments)
include(FetchContent)

FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz)
FetchContent_Declare(json GIT_REPOSITORY https://github.com/nlohmann/json.git
GIT_TAG d41ca94fa85d5119852e2f7a3f94335cc7cb0486 # PR #4709, fixes cmake deprecation warnings
)
FetchContent_Declare(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG a7f443b80b105f940225332ed3c31f2790092f47 # latest main
Expand Down