IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow running samples CMakeLists.txt as stand alone (#14826)

Browse Source 
* Allow running samples CMakeLists.txt as stand alone

* Don't add cnpy twice

* Fix binary path
This commit is contained in:
Zlobin Vladimir 2022-12-27 17:44:46 +04:00 committed by GitHub
parent b8c92fce70
commit 055e34a77a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samples/cpp/benchmark_app/CMakeLists.txt
View File

@ -59,10 +59,17 @@ if(NOT TARGET nlohmann_json::nlohmann_json)
if(NOT nlohmann_json_FOUND) if(NOT nlohmann_json_FOUND)
if(EXISTS "${Samples_SOURCE_DIR}/thirdparty/nlohmann_json") if(EXISTS "${Samples_SOURCE_DIR}/thirdparty/nlohmann_json")
# OpenVINO package puts thirdparty to samples dir
# suppress shadowing names warning # suppress shadowing names warning
set(JSON_SystemInclude ON CACHE BOOL "" FORCE) set(JSON_SystemInclude ON CACHE BOOL "" FORCE)
add_subdirectory("${Samples_SOURCE_DIR}/thirdparty/nlohmann_json" add_subdirectory("${Samples_SOURCE_DIR}/thirdparty/nlohmann_json"
"${Samples_BINARY_DIR}/thirdparty/nlohmann_json" EXCLUDE_FROM_ALL) "${Samples_BINARY_DIR}/thirdparty/nlohmann_json" EXCLUDE_FROM_ALL)
elseif(EXISTS "${Samples_SOURCE_DIR}../../thirdparty/nlohmann_json")
# Allow running samples CMakeLists.txt as stand alone from openvino sources
# 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() else()
message(FATAL_ERROR "Failed to find / build nlohmann_json library") message(FATAL_ERROR "Failed to find / build nlohmann_json library")
endif() endif()

10
samples/cpp/speech_sample/CMakeLists.txt
View File

@ -25,14 +25,24 @@ if(NOT TARGET zlib::zlib)
if(zlib_FOUND) if(zlib_FOUND)
message(STATUS "${PKG_CONFIG_EXECUTABLE}: zlib (${zlib_VERSION}) is found at ${zlib_PREFIX}") message(STATUS "${PKG_CONFIG_EXECUTABLE}: zlib (${zlib_VERSION}) is found at ${zlib_PREFIX}")
elseif(EXISTS "${Samples_SOURCE_DIR}/thirdparty/zlib") elseif(EXISTS "${Samples_SOURCE_DIR}/thirdparty/zlib")
# OpenVINO package puts thirdparty to samples dir
add_subdirectory("${Samples_SOURCE_DIR}/thirdparty/zlib" add_subdirectory("${Samples_SOURCE_DIR}/thirdparty/zlib"
"${Samples_BINARY_DIR}/thirdparty/zlib" EXCLUDE_FROM_ALL) "${Samples_BINARY_DIR}/thirdparty/zlib" EXCLUDE_FROM_ALL)
elseif(EXISTS "${Samples_SOURCE_DIR}/thirdparty/zlib")
# Allow running samples CMakeLists.txt as stand alone from openvino sources
add_subdirectory("${Samples_SOURCE_DIR}/../../thirdparty/zlib"
"${Samples_BINARY_DIR}/thirdparty/zlib" EXCLUDE_FROM_ALL)
endif() endif()
endif() endif()
if(EXISTS "${Samples_SOURCE_DIR}/thirdparty/cnpy") if(EXISTS "${Samples_SOURCE_DIR}/thirdparty/cnpy")
# OpenVINO package puts thirdparty to samples dir
add_subdirectory("${Samples_SOURCE_DIR}/thirdparty/cnpy" add_subdirectory("${Samples_SOURCE_DIR}/thirdparty/cnpy"
"${Samples_BINARY_DIR}/thirdparty/cnpy" EXCLUDE_FROM_ALL) "${Samples_BINARY_DIR}/thirdparty/cnpy" EXCLUDE_FROM_ALL)
elseif(EXISTS "${Samples_SOURCE_DIR}/../../thirdparty/cnpy" AND NOT TARGET cnpy)
# Allow running samples CMakeLists.txt as stand alone from openvino sources
add_subdirectory("${Samples_SOURCE_DIR}/../../thirdparty/cnpy"
"${Samples_BINARY_DIR}/thirdparty/cnpy" EXCLUDE_FROM_ALL)
endif() endif()
# add sample # add sample