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

Simplify cmake check for Ninja multi-config (#24651) 

### Details:
 - *item1*
 - *...*

### Tickets:
 - *ticket-id*
This commit is contained in:
Ilya Lavrenov 2024-05-24 04:08:08 +04:00 committed by GitHub
parent 3ca4919219
commit e2b646f91e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -71,7 +71,7 @@ if(OV_GENERATOR_MULTI_CONFIG)
string(REPLACE ";" " " config_types "${CMAKE_CONFIGURATION_TYPES}") string(REPLACE ";" " " config_types "${CMAKE_CONFIGURATION_TYPES}")
message (STATUS "CMAKE_CONFIGURATION_TYPES ............. " ${config_types}) message (STATUS "CMAKE_CONFIGURATION_TYPES ............. " ${config_types})
unset(config_types) unset(config_types)
if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$") if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
message (STATUS "CMAKE_DEFAULT_BUILD_TYPE .............. " ${CMAKE_DEFAULT_BUILD_TYPE}) message (STATUS "CMAKE_DEFAULT_BUILD_TYPE .............. " ${CMAKE_DEFAULT_BUILD_TYPE})
endif() endif()
else() else()

2
cmake/developer_package/cross_compile/native_compile.cmake
View File

@ -71,7 +71,7 @@ function(ov_native_compile_external_project)
endif() endif()
if(OV_GENERATOR_MULTI_CONFIG) if(OV_GENERATOR_MULTI_CONFIG)
if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$") if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
list(APPEND ARG_CMAKE_ARGS "-DCMAKE_CONFIGURATION_TYPES=${CMAKE_DEFAULT_BUILD_TYPE}") list(APPEND ARG_CMAKE_ARGS "-DCMAKE_CONFIGURATION_TYPES=${CMAKE_DEFAULT_BUILD_TYPE}")
list(APPEND ARG_CMAKE_ARGS "-DCMAKE_DEFAULT_BUILD_TYPE=${CMAKE_DEFAULT_BUILD_TYPE}") list(APPEND ARG_CMAKE_ARGS "-DCMAKE_DEFAULT_BUILD_TYPE=${CMAKE_DEFAULT_BUILD_TYPE}")
endif() endif()

2
cmake/templates/OpenVINODeveloperPackageConfig.cmake.in
View File

@ -22,7 +22,7 @@ endif()
get_property(_OV_GENERATOR_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) get_property(_OV_GENERATOR_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(_OV_GENERATOR_MULTI_CONFIG) if(_OV_GENERATOR_MULTI_CONFIG)
list(APPEND ov_options CMAKE_CONFIGURATION_TYPES) list(APPEND ov_options CMAKE_CONFIGURATION_TYPES)
if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$") if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
list(APPEND ov_options CMAKE_DEFAULT_BUILD_TYPE) list(APPEND ov_options CMAKE_DEFAULT_BUILD_TYPE)
endif() endif()
else() else()

2
cmake/templates/OpenVINODeveloperPackageConfigRelocatable.cmake.in
View File

@ -18,7 +18,7 @@ endif()
get_property(_OV_GENERATOR_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) get_property(_OV_GENERATOR_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(_OV_GENERATOR_MULTI_CONFIG) if(_OV_GENERATOR_MULTI_CONFIG)
list(APPEND ov_options CMAKE_CONFIGURATION_TYPES) list(APPEND ov_options CMAKE_CONFIGURATION_TYPES)
if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$") if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
list(APPEND ov_options CMAKE_DEFAULT_BUILD_TYPE) list(APPEND ov_options CMAKE_DEFAULT_BUILD_TYPE)
endif() endif()
else() else()

2
samples/cpp/CMakeLists.txt
View File

@ -12,7 +12,7 @@ endif()
project(Samples) project(Samples)
get_property(OV_GENERATOR_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) get_property(OV_GENERATOR_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$") if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
# Ninja-Multi specific, see: # Ninja-Multi specific, see:
# https://cmake.org/cmake/help/latest/variable/CMAKE_DEFAULT_BUILD_TYPE.html # https://cmake.org/cmake/help/latest/variable/CMAKE_DEFAULT_BUILD_TYPE.html
set(CMAKE_DEFAULT_BUILD_TYPE "Release" CACHE STRING "CMake default build type") set(CMAKE_DEFAULT_BUILD_TYPE "Release" CACHE STRING "CMake default build type")

2
src/plugins/intel_gpu/thirdparty/CMakeLists.txt vendored
View File

@ -53,7 +53,7 @@ if(ENABLE_ONEDNN_FOR_GPU)
endforeach() endforeach()
if(OV_GENERATOR_MULTI_CONFIG) if(OV_GENERATOR_MULTI_CONFIG)
if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$") if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
list(APPEND cmake_extra_args "-DCMAKE_CONFIGURATION_TYPES=${CMAKE_DEFAULT_BUILD_TYPE}") list(APPEND cmake_extra_args "-DCMAKE_CONFIGURATION_TYPES=${CMAKE_DEFAULT_BUILD_TYPE}")
list(APPEND cmake_extra_args "-DCMAKE_DEFAULT_BUILD_TYPE=${CMAKE_DEFAULT_BUILD_TYPE}") list(APPEND cmake_extra_args "-DCMAKE_DEFAULT_BUILD_TYPE=${CMAKE_DEFAULT_BUILD_TYPE}")
endif() endif()