Fixed ApiValidator search

openvinotoolkit · Jan 7, 2025 · 70dbe34 · 70dbe34
1 parent 62ca28d
commit 70dbe34
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/cmake/developer_package/api_validator/api_validator.cmake b/cmake/developer_package/api_validator/api_validator.cmake
@@ -30,12 +30,11 @@ can't find Windows SDK version. Try to use vcvarsall.bat script")
                       "${PROGRAMFILES}/Windows Kits/10/bin/x64")
     endif()
 
-    # check UniversalCRTSdkDir env variable
+    # check WindowsSdkBinPath env variable
     if(DEFINED ENV{WindowsSdkBinPath})
         file(TO_CMAKE_PATH $ENV{WindowsSdkBinPath} UNIVERSAL_SDK_BIN_PATH)
 
-        list(APPEND WDK_PATHS "${UNIVERSAL_SDK_BIN_PATH}/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/x64"
-                              "${UNIVERSAL_SDK_BIN_PATH}/x64")
+        list(APPEND WDK_PATHS "${UNIVERSAL_SDK_BIN_PATH}/x64")
     endif()
 
     if(WDK_PATHS)

diff --git a/cmake/developer_package/features.cmake b/cmake/developer_package/features.cmake
@@ -42,6 +42,8 @@ ov_option (ENABLE_THREAD_SANITIZER "enable checking data races via ThreadSanitiz
 
 ov_dependent_option (ENABLE_COVERAGE "enable code coverage" OFF "CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG" OFF)
 
+ov_dependent_option (ENABLE_API_VALIDATOR "Enables API Validator usage" ON "WIN32" OFF)
+
 # Defines CPU capabilities
 
 ov_dependent_option (ENABLE_SSE42 "Enable SSE4.2 optimizations" ON "X86_64 OR (X86 AND NOT EMSCRIPTEN)" OFF)

diff --git a/cmake/features.cmake b/cmake/features.cmake
@@ -208,8 +208,6 @@ ov_dependent_option(ENABLE_JS "Enables JS API building" ${ENABLE_JS_DEFAULT} "NO
 
 ov_option(ENABLE_OPENVINO_DEBUG "Enable output for OPENVINO_DEBUG statements" OFF)
 
-ov_dependent_option (ENABLE_API_VALIDATOR "Enables API Validator usage" ON "WIN32" OFF)
-
 if(NOT BUILD_SHARED_LIBS AND ENABLE_OV_TF_FRONTEND)
     set(FORCE_FRONTENDS_USE_PROTOBUF ON)
 else()

diff --git a/src/common/util/CMakeLists.txt b/src/common/util/CMakeLists.txt
@@ -66,7 +66,11 @@ else()
   message(WARNING "Unknown C++ build setup - No explicit filesystem linker setting set")
 endif()
 
-target_link_libraries(${TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS} PUBLIC openvino::pugixml $<WIN32:Shlwapi> ${STD_FS_LIB})
+target_link_libraries(${TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS} PUBLIC openvino::pugixml ${STD_FS_LIB})
+if (WIN32)
+    target_link_libraries(${TARGET_NAME} PRIVATE Shlwapi)
+endif()
+
 target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${UTIL_INCLUDE_DIR}>)
 
 ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})