Skip to content

Commit

Permalink
Reverted temporary WAs for gflags installation for CentOS 7 (#14370)
Browse files Browse the repository at this point in the history
  • Loading branch information
ilya-lavrenov authored Dec 2, 2022
1 parent 78f95dd commit cf8c784
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions samples/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,9 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
endif()
####################################

if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/common/utils")
set(gflags_required ON)
endif()

if(TARGET gflags)
set(GFLAGS_TARGET gflags)
elseif(gflags_required)
else()
if(EXISTS /etc/debian_version)
set(gflags_component nothreads_static)
else()
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ if(CPACK_GENERATOR MATCHES "^(DEB|RPM|CONDA-FORGE|BREW)$")
if(NOT ENABLE_SYSTEM_PUGIXML)
message(FATAL_ERROR "Pugixml must be used as a ${CPACK_GENERATOR} package. Install libpugixml-dev / pugixml-devel")
endif()
elseif(APPLE OR WIN32 OR LINUX_OS_NAME STREQUAL "CentOS 7")
elseif(APPLE OR WIN32)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gflags
DESTINATION ${OV_CPACK_SAMPLESDIR}/cpp/thirdparty
COMPONENT ${OV_CPACK_COMP_CPP_SAMPLES}
Expand Down

0 comments on commit cf8c784

Please sign in to comment.