diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt index 7b93a4291a2..15d248379d7 100644 --- a/inference-engine/ie_bridges/python/CMakeLists.txt +++ b/inference-engine/ie_bridges/python/CMakeLists.txt @@ -43,12 +43,14 @@ else() endif() if(ENABLE_CONDA_FOLDER) + set(PYTHON_COMPONENT conda_${PYTHON_VERSION}) if(WIN32) set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$/python_api/Conda/${PYTHON_VERSION}/openvino) else() set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/python_api/Conda/${PYTHON_VERSION}/openvino) endif() else() + set(PYTHON_COMPONENT ${PYTHON_VERSION}) if(WIN32) set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$/python_api/${PYTHON_VERSION}/openvino) else() @@ -74,19 +76,19 @@ endif() # install -ie_cpack_add_component(${PYTHON_VERSION}) +ie_cpack_add_component(${PYTHON_COMPONENT}) install(FILES requirements.txt DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION} - COMPONENT ${PYTHON_VERSION}) + COMPONENT ${PYTHON_COMPONENT}) install(FILES requirements.txt DESTINATION ${PYTHON_BRIDGE_CPACK_PATH} - COMPONENT ${PYTHON_VERSION}) + COMPONENT ${PYTHON_COMPONENT}) install(PROGRAMS src/openvino/__init__.py DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino - COMPONENT ${PYTHON_VERSION}) + COMPONENT ${PYTHON_COMPONENT}) # install Python samples @@ -96,4 +98,4 @@ install(DIRECTORY sample/ DESTINATION ${IE_CPACK_IE_DIR}/samples/python COMPONENT python_samples) -ie_cpack(${PYTHON_VERSION} python_samples) +ie_cpack(${PYTHON_COMPONENT} python_samples) diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt index a236db836d6..059f335f5df 100644 --- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt +++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt @@ -70,12 +70,12 @@ add_custom_command(TARGET ${TARGET_NAME} # install install(TARGETS ${INSTALLED_TARGETS} - RUNTIME DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine COMPONENT ${PYTHON_VERSION} - LIBRARY DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine COMPONENT ${PYTHON_VERSION}) + RUNTIME DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine COMPONENT ${PYTHON_COMPONENT} + LIBRARY DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine COMPONENT ${PYTHON_COMPONENT}) install(PROGRAMS __init__.py DESTINATION ${PYTHON_BRIDGE_CPACK_PATH}/${PYTHON_VERSION}/openvino/inference_engine - COMPONENT ${PYTHON_VERSION}) + COMPONENT ${PYTHON_COMPONENT}) add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME} EXCLUDE_PATTERNS ".*\\.cxx;.*\\.pxd;.*\\.pyx") diff --git a/inference-engine/ie_bridges/python/src/openvino/offline_transformations/CMakeLists.txt b/inference-engine/ie_bridges/python/src/openvino/offline_transformations/CMakeLists.txt index 27c9e7bf898..ba526c3761d 100644 --- a/inference-engine/ie_bridges/python/src/openvino/offline_transformations/CMakeLists.txt +++ b/inference-engine/ie_bridges/python/src/openvino/offline_transformations/CMakeLists.txt @@ -54,12 +54,12 @@ add_custom_command(TARGET ${TARGET_NAME} # install # TODO: use ${PYTHON_VERSION}_dev component below -# ie_cpack_add_component(${PYTHON_VERSION}_dev DEPENDS ${PYTHON_VERSION}) +# ie_cpack_add_component(${PYTHON_VERSION}_dev DEPENDS ${PYTHON_COMPONENT}) install(TARGETS ${TARGET_NAME} - RUNTIME DESTINATION python/${PYTHON_VERSION}/openvino/offline_transformations COMPONENT ${PYTHON_VERSION} - LIBRARY DESTINATION python/${PYTHON_VERSION}/openvino/offline_transformations COMPONENT ${PYTHON_VERSION}) + RUNTIME DESTINATION python/${PYTHON_VERSION}/openvino/offline_transformations COMPONENT ${PYTHON_COMPONENT} + LIBRARY DESTINATION python/${PYTHON_VERSION}/openvino/offline_transformations COMPONENT ${PYTHON_COMPONENT}) install(PROGRAMS __init__.py DESTINATION python/${PYTHON_VERSION}/openvino/offline_transformations - COMPONENT ${PYTHON_VERSION}) + COMPONENT ${PYTHON_COMPONENT})