From cf8c78483d8d281fd968df2ea91fab6a46c2a52d Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 2 Dec 2022 22:10:02 +0400 Subject: [PATCH] Reverted temporary WAs for gflags installation for CentOS 7 (#14370) --- samples/cpp/CMakeLists.txt | 6 +----- thirdparty/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index 90f1e043c36..aba4c04d2e6 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -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() diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 26e2f56c2e7..9796d67ae2a 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -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}