Added Debian, Raspbian, Ubuntu 22.10 support to install dependencies (#14226)
* Added Debian, Raspbian, Ubuntu 22.10 support * Updated dependencies.cmake * Fixes in script * Added RHEL 9.1 support * Added proper comments * Compilation of rpm packages for aarch64 is fixed * Proper generation of requirements.txt files when ENABLE_WHEEL=OFF * samples build improvements * Proper name for json library * Proper condtion in samples
This commit is contained in:
@@ -31,11 +31,15 @@ if(NOT TARGET nlohmann_json::nlohmann_json)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(NOT nlohmann_json_FOUND AND EXISTS "${Samples_SOURCE_DIR}/thirdparty/nlohmann_json")
|
||||
# suppress shadowing names warning
|
||||
set(JSON_SystemInclude ON CACHE BOOL "" FORCE)
|
||||
add_subdirectory("${Samples_SOURCE_DIR}/thirdparty/nlohmann_json"
|
||||
"${Samples_BINARY_DIR}/thirdparty/nlohmann_json" EXCLUDE_FROM_ALL)
|
||||
if(NOT nlohmann_json_FOUND)
|
||||
if(EXISTS "${Samples_SOURCE_DIR}/thirdparty/nlohmann_json")
|
||||
# suppress shadowing names warning
|
||||
set(JSON_SystemInclude ON CACHE BOOL "" FORCE)
|
||||
add_subdirectory("${Samples_SOURCE_DIR}/thirdparty/nlohmann_json"
|
||||
"${Samples_BINARY_DIR}/thirdparty/nlohmann_json" EXCLUDE_FROM_ALL)
|
||||
else()
|
||||
message(FATAL_ERROR "Failed to find / build nlohmann_json library")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user