From e94f7b25c0bc06a3f05831c3d0080fba31ff9fbf Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 30 Mar 2023 21:01:41 +0400 Subject: [PATCH] Fixed cmake dev warnings (#16655) --- CMakeLists.txt | 4 ++++ cmake/developer_package/native_compile.cmake | 11 +++++++++-- src/plugins/intel_gpu/thirdparty/CMakeLists.txt | 16 +++++++++++++--- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de4f80b8cf9..92bb7b0f19b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,10 @@ else() endif() endif() +if(POLICY CMP0091) + cmake_policy(SET CMP0091 NEW) # Enables use of MSVC_RUNTIME_LIBRARY +endif() + project(OpenVINO DESCRIPTION "OpenVINO toolkit") find_package(IEDevScripts REQUIRED diff --git a/cmake/developer_package/native_compile.cmake b/cmake/developer_package/native_compile.cmake index 7b23986ddb8..638d2b15cf1 100644 --- a/cmake/developer_package/native_compile.cmake +++ b/cmake/developer_package/native_compile.cmake @@ -72,6 +72,15 @@ function(ov_native_compile_external_project) list(APPEND ARG_CMAKE_ARGS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") endif() + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.21) + if(DEFINED CMAKE_CXX_LINKER_LAUNCHER) + list(APPEND ARG_CMAKE_ARGS "-DCMAKE_CXX_LINKER_LAUNCHER=${CMAKE_CXX_LINKER_LAUNCHER}") + endif() + if(DEFINED CMAKE_C_LINKER_LAUNCHER) + list(APPEND ARG_CMAKE_ARGS "-DCMAKE_C_LINKER_LAUNCHER=${CMAKE_C_LINKER_LAUNCHER}") + endif() + endif() + ExternalProject_Add(${ARG_TARGET_NAME} # Directory Options SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" @@ -84,8 +93,6 @@ function(ov_native_compile_external_project) CMAKE_ARGS "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}" "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}" - "-DCMAKE_CXX_LINKER_LAUNCHER=${CMAKE_CXX_LINKER_LAUNCHER}" - "-DCMAKE_C_LINKER_LAUNCHER=${CMAKE_C_LINKER_LAUNCHER}" "-DCMAKE_CXX_FLAGS=${compile_flags}" "-DCMAKE_C_FLAGS=${compile_flags}" "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW" diff --git a/src/plugins/intel_gpu/thirdparty/CMakeLists.txt b/src/plugins/intel_gpu/thirdparty/CMakeLists.txt index 3d81054936a..f25d0f44cba 100644 --- a/src/plugins/intel_gpu/thirdparty/CMakeLists.txt +++ b/src/plugins/intel_gpu/thirdparty/CMakeLists.txt @@ -52,6 +52,19 @@ if(ENABLE_ONEDNN_FOR_GPU) list(APPEND cmake_extra_args "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") endif() + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.21) + if(DEFINED CMAKE_CXX_LINKER_LAUNCHER) + list(APPEND cmake_extra_args "-DCMAKE_CXX_LINKER_LAUNCHER=${CMAKE_CXX_LINKER_LAUNCHER}") + endif() + if(DEFINED CMAKE_C_LINKER_LAUNCHER) + list(APPEND cmake_extra_args "-DCMAKE_C_LINKER_LAUNCHER=${CMAKE_C_LINKER_LAUNCHER}") + endif() + endif() + + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.15 AND DEFINED CMAKE_MSVC_RUNTIME_LIBRARY) + list(APPEND cmake_extra_args "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}") + endif() + ExternalProject_Add(onednn_gpu_build SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/onednn_gpu" BINARY_DIR "${ONEDNN_BUILD_DIR}" @@ -70,13 +83,10 @@ if(ENABLE_ONEDNN_FOR_GPU) "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}" "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}" "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}" - "-DCMAKE_CXX_LINKER_LAUNCHER=${CMAKE_CXX_LINKER_LAUNCHER}" - "-DCMAKE_C_LINKER_LAUNCHER=${CMAKE_C_LINKER_LAUNCHER}" "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}" "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}" "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE=${ENABLE_LTO}" "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW" - "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}" "-DDNNL_CPU_RUNTIME=NONE" "-DDNNL_GPU_RUNTIME=OCL" "-DDNNL_LIBRARY_NAME=onednn_gpu"