Fixes for multi-config generators (#16097)
This commit is contained in:
1 parent
9c4c559909
commit
e1fbb7d768
15 files changed
+115
-58
No files matched your search
+7
-11
@@ -27,16 +27,16 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
|
||||
ie_cpack_add_component(${OV_CPACK_COMP_SETUPVARS} HIDDEN)
|
||||
|
||||
if(UNIX)
|
||||
set(_setupvars_file setupvars/setupvars.sh)
|
||||
set(_setupvars_file "${CMAKE_CURRENT_SOURCE_DIR}/setupvars/setupvars.sh")
|
||||
elseif(WIN32)
|
||||
set(_setupvars_file setupvars/setupvars.bat)
|
||||
if (USE_BUILD_TYPE_SUBFOLDER AND CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
|
||||
set(_setupvars_file "${CMAKE_CURRENT_SOURCE_DIR}/setupvars/setupvars.bat")
|
||||
if(USE_BUILD_TYPE_SUBFOLDER AND CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release)$")
|
||||
# Patch primary configuration in setupvars.bat which is "Release" by default.
|
||||
# Note setupvars secondary configuration is always "Debug".
|
||||
message(STATUS "Patching content of ${_setupvars_file} for CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
|
||||
file(READ "${_setupvars_file}" _setupvars_content)
|
||||
string(REPLACE "Release" ${CMAKE_BUILD_TYPE} _setupvars_content "${_setupvars_content}")
|
||||
set(_setupvars_file "${CMAKE_BINARY_DIR}/${_setupvars_file}")
|
||||
set(_setupvars_file "${OpenVINO_BINARY_DIR}/${_setupvars_file}")
|
||||
message(STATUS "Writing patched content to ${_setupvars_file}")
|
||||
file(WRITE "${_setupvars_file}" "${_setupvars_content}")
|
||||
endif()
|
||||
@@ -51,11 +51,7 @@ install(PROGRAMS "${_setupvars_file}"
|
||||
if(LINUX)
|
||||
ie_cpack_add_component(${OV_CPACK_COMP_INSTALL_DEPENDENCIES} HIDDEN)
|
||||
|
||||
set(install_dependencies_files install_openvino_dependencies.sh)
|
||||
|
||||
foreach(install_dependencies_file IN LISTS install_dependencies_files)
|
||||
install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/install_dependencies/${install_dependencies_file}"
|
||||
DESTINATION install_dependencies/
|
||||
COMPONENT ${OV_CPACK_COMP_INSTALL_DEPENDENCIES})
|
||||
endforeach()
|
||||
install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/install_dependencies/install_openvino_dependencies.sh"
|
||||
DESTINATION install_dependencies/
|
||||
COMPONENT ${OV_CPACK_COMP_INSTALL_DEPENDENCIES})
|
||||
endif()
|
||||
Reference in new issue
Block a user