From 9c2b3f24a9c5b82f02e1c4a6fc51a4e0883e5040 Mon Sep 17 00:00:00 2001 From: Sergey Shlyapnikov Date: Thu, 23 Sep 2021 18:42:19 +0300 Subject: [PATCH] Fix benchmark_app build (#7577) --- inference-engine/samples/benchmark_app/CMakeLists.txt | 10 ++++++---- thirdparty/CMakeLists.txt | 4 +++- thirdparty/ocl/CMakeLists.txt | 4 ---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/inference-engine/samples/benchmark_app/CMakeLists.txt b/inference-engine/samples/benchmark_app/CMakeLists.txt index e3412774f27..4913084f94d 100644 --- a/inference-engine/samples/benchmark_app/CMakeLists.txt +++ b/inference-engine/samples/benchmark_app/CMakeLists.txt @@ -32,16 +32,18 @@ find_path(OpenCL_HPP_INCLUDE_DIR OpenCL/common/inc "AMD APP/include") -if(OPENCL_HEADERS_DIR) +if(TARGET OpenCL) # Use OpenCL CPP headers from sources if present - set(OpenCL_HEADERS OPENCL_HEADERS_DIR) + set(OpenCL_HEADERS ${OPENCL_HEADERS_DIR}) + set(OpenCL_LIB "OpenCL") elseif(OpenCL_HPP_INCLUDE_DIR) # Append OpenCL CPP headers to C headers and use both - set(OpenCL_HEADERS OpenCL_INCLUDE_DIR OpenCL_HPP_INCLUDE_DIR) + set(OpenCL_HEADERS ${OpenCL_INCLUDE_DIR} ${OpenCL_HPP_INCLUDE_DIR}) + set(OpenCL_LIB "OpenCL::OpenCL") endif() if(OpenCL_FOUND AND OpenCL_HEADERS) - target_link_libraries(${TARGET_NAME} PRIVATE OpenCL::OpenCL) + target_link_libraries(${TARGET_NAME} PRIVATE ${OpenCL_LIB}) target_include_directories(${TARGET_NAME} PRIVATE ${OpenCL_HEADERS}) target_compile_definitions(${TARGET_NAME} PRIVATE HAVE_GPU_DEVICE_MEM_SUPPORT) endif() diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 4c8e6e3495a..f4c57f83c0e 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -14,7 +14,9 @@ add_subdirectory(ittapi EXCLUDE_FROM_ALL) add_subdirectory(itt_collector EXCLUDE_FROM_ALL) add_subdirectory(zlib EXCLUDE_FROM_ALL) add_subdirectory(cnpy EXCLUDE_FROM_ALL) -add_subdirectory(ocl EXCLUDE_FROM_ALL) +if(ENABLE_CLDNN) + add_subdirectory(ocl EXCLUDE_FROM_ALL) +endif() add_subdirectory(xbyak EXCLUDE_FROM_ALL) openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak) diff --git a/thirdparty/ocl/CMakeLists.txt b/thirdparty/ocl/CMakeLists.txt index 6fb15435d5a..a0648080ea1 100644 --- a/thirdparty/ocl/CMakeLists.txt +++ b/thirdparty/ocl/CMakeLists.txt @@ -2,10 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 # -if(NOT ENABLE_CLDNN) - return() -endif() - function(get_lib_name TARGET_NAME LIBRARY_NAME) if (CMAKE_BUILD_TYPE STREQUAL "Debug") set(BUILD_SUFFIX ${IE_DEBUG_POSTFIX})