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

Reverted temporary WAs for gflags installation for CentOS 7 (#14370)

Browse Source
This commit is contained in:
Ilya Lavrenov 2022-12-02 22:10:02 +04:00 committed by GitHub
parent 78f95ddea4
commit cf8c78483d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/cpp/CMakeLists.txt
View File

@ -97,13 +97,9 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
endif() endif()
#################################### ####################################
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/common/utils")
set(gflags_required ON)
endif()
if(TARGET gflags) if(TARGET gflags)
set(GFLAGS_TARGET gflags) set(GFLAGS_TARGET gflags)
elseif(gflags_required) else()
if(EXISTS /etc/debian_version) if(EXISTS /etc/debian_version)
set(gflags_component nothreads_static) set(gflags_component nothreads_static)
else() else()

2
thirdparty/CMakeLists.txt vendored
View File

@ -330,7 +330,7 @@ if(CPACK_GENERATOR MATCHES "^(DEB|RPM|CONDA-FORGE|BREW)$")
if(NOT ENABLE_SYSTEM_PUGIXML) if(NOT ENABLE_SYSTEM_PUGIXML)
message(FATAL_ERROR "Pugixml must be used as a ${CPACK_GENERATOR} package. Install libpugixml-dev / pugixml-devel") message(FATAL_ERROR "Pugixml must be used as a ${CPACK_GENERATOR} package. Install libpugixml-dev / pugixml-devel")
endif() endif()
elseif(APPLE OR WIN32 OR LINUX_OS_NAME STREQUAL "CentOS 7") elseif(APPLE OR WIN32)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gflags install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gflags
DESTINATION ${OV_CPACK_SAMPLESDIR}/cpp/thirdparty DESTINATION ${OV_CPACK_SAMPLESDIR}/cpp/thirdparty
COMPONENT ${OV_CPACK_COMP_CPP_SAMPLES} COMPONENT ${OV_CPACK_COMP_CPP_SAMPLES}