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

Allow enabling cpplint on Windows, fix Windows style after check (#4380)

Browse Source
This commit is contained in:
Szymon Irzabek 2021-02-18 12:20:10 +01:00 committed by GitHub
parent 312dfbe78e
commit 2051fe2614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/developer_package/features.cmake
View File

@ -42,9 +42,13 @@ ie_option (BUILD_SHARED_LIBS "Build as a shared library" ON)
ie_dependent_option (ENABLE_FASTER_BUILD "Enable build features (PCH, UNITY) to speed up build time" OFF "CMAKE_VERSION VERSION_GREATER_EQUAL 3.16" OFF)
ie_dependent_option (ENABLE_CPPLINT "Enable cpplint checks during the build" ON "UNIX;NOT ANDROID" OFF)
if(NOT DEFINED ENABLE_CPPLINT)
ie_dependent_option (ENABLE_CPPLINT "Enable cpplint checks during the build" ON "UNIX;NOT ANDROID" OFF)
endif()
ie_dependent_option (ENABLE_CPPLINT_REPORT "Build cpplint report instead of failing the build" OFF "ENABLE_CPPLINT" OFF)
if(NOT DEFINED ENABLE_CPPLINT_REPORT)
ie_dependent_option (ENABLE_CPPLINT_REPORT "Build cpplint report instead of failing the build" OFF "ENABLE_CPPLINT" OFF)
endif()
ie_option (ENABLE_CLANG_FORMAT "Enable clang-format checks during the build" ON)

4
inference-engine/src/inference_engine/os/win/win_shared_object_loader.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2018-2020 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
#include "details/ie_exception.hpp"
#include "details/ie_so_loader.h"
#include "file_utils.h"
@ -204,7 +204,7 @@ class SharedObjectLoader::Impl {
ExcludeCurrentDirectoryW();
LoadPluginFromDirectoryW(pluginName);
if(!shared_object) {
if (!shared_object) {
shared_object = LoadLibraryW(pluginName);
}