Fix conditions for python when cmake debug prefix is not empty (#12601)

This commit is contained in:
Ilya Lavrenov
2022-08-18 08:31:23 +04:00
committed by GitHub
parent d958fccb8b
commit 5d31a27f57
19 changed files with 76 additions and 68 deletions

View File

@@ -24,8 +24,8 @@ if(BUILD_SHARED_LIBS)
RUNTIME DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT tests EXCLUDE_FROM_ALL
LIBRARY DESTINATION ${OV_CPACK_LIBRARYDIR} COMPONENT tests EXCLUDE_FROM_ALL)
else()
set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
set(pyversion python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
install(TARGETS ${TARGET_FE_NAME}
RUNTIME DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION}/openvino COMPONENT tests EXCLUDE_FROM_ALL
LIBRARY DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION}/openvino COMPONENT tests EXCLUDE_FROM_ALL)
RUNTIME DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion}/openvino COMPONENT tests EXCLUDE_FROM_ALL
LIBRARY DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion}/openvino COMPONENT tests EXCLUDE_FROM_ALL)
endif()

View File

@@ -7,13 +7,13 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_OLD ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_OLD ${CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY})
set(CMAKE_PDB_OUTPUT_DIRECTORY_OLD ${CMAKE_PDB_OUTPUT_DIRECTORY})
set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
message(STATUS "Python version=${PYTHON_VERSION}")
set(pyversion python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
message(STATUS "Python version=${pyversion}")
if(WIN32)
set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<CONFIG>/python_api/${PYTHON_VERSION}/)
set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<CONFIG>/python_api/${pyversion}/)
else()
set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/${PYTHON_VERSION}/)
set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/${pyversion}/)
endif()
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY})
@@ -47,5 +47,5 @@ set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_OLD}
set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_PDB_OUTPUT_DIRECTORY_OLD})
install(TARGETS ${PYBIND_FE_NAME}
DESTINATION ${OV_CPACK_PYTHONDIR}/${PYTHON_VERSION}
DESTINATION ${OV_CPACK_PYTHONDIR}/${pyversion}
COMPONENT tests EXCLUDE_FROM_ALL)