From 21453439cd6d89058710e868f05727502e556f99 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 11 Jun 2020 14:24:04 +0800 Subject: [PATCH] cmake installation fixes Make sure that libraries/samples/binaries are installed correctly. Signed-off-by: Anuj Mittal --- CMakeLists.txt | 15 --------------- cmake/developer_package/IEDevScriptsConfig.cmake | 2 +- cmake/developer_package/packaging.cmake | 8 +++++--- cmake/developer_package/plugins/plugins.cmake | 2 +- .../samples/common/opencv_c_wraper/CMakeLists.txt | 2 ++ inference-engine/samples/CMakeLists.txt | 4 +++- .../samples/common/format_reader/CMakeLists.txt | 2 ++ .../src/inference_engine/CMakeLists.txt | 4 ++-- inference-engine/src/preprocessing/CMakeLists.txt | 2 +- .../src/readers/ir_reader/CMakeLists.txt | 2 +- .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- inference-engine/tests/unit/cpu/CMakeLists.txt | 2 ++ .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ inference-engine/tests/unit/vpu/CMakeLists.txt | 2 ++ .../tools/compile_tool/CMakeLists.txt | 2 +- 15 files changed, 26 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e72f2b61f1..2c22827e2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,7 +105,6 @@ function(build_ngraph) ie_cpack_add_component(ngraph) set(SDL_cmake_included ON) - set(NGRAPH_COMPONENT_PREFIX "deployment_tools/ngraph/") add_subdirectory(ngraph) set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE) set(NGRAPH_REF_LIBRARIES ngraph_reference PARENT_SCOPE) @@ -174,12 +173,8 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}" # install setupvars -ie_cpack_add_component(setupvars REQUIRED) if(UNIX) - install(PROGRAMS scripts/setupvars/setupvars.sh - DESTINATION bin - COMPONENT setupvars) elseif(WIN32) install(PROGRAMS scripts/setupvars/setupvars.bat DESTINATION bin @@ -189,22 +184,12 @@ endif() # install install_dependencies if(UNIX) - ie_cpack_add_component(install_dependencies REQUIRED) - install(DIRECTORY scripts/install_dependencies/ - DESTINATION install_dependencies - COMPONENT install_dependencies) endif() # install files for demo -ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core) if(UNIX) - install(DIRECTORY scripts/demo/ - DESTINATION deployment_tools/demo - COMPONENT demo_scripts - USE_SOURCE_PERMISSIONS - PATTERN *.bat EXCLUDE) elseif(WIN32) install(DIRECTORY scripts/demo/ DESTINATION deployment_tools/demo diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake index ed6971fd37..10817d3a75 100644 --- a/cmake/developer_package/IEDevScriptsConfig.cmake +++ b/cmake/developer_package/IEDevScriptsConfig.cmake @@ -121,7 +121,7 @@ if(NOT DEFINED OUTPUT_ROOT) if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR) message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined") endif() - set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) + set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) endif() # Enable postfixes for Debug/Release builds diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake index b846bf732d..7a0022968c 100644 --- a/cmake/developer_package/packaging.cmake +++ b/cmake/developer_package/packaging.cmake @@ -4,7 +4,9 @@ include(CPackComponent) unset(IE_CPACK_COMPONENTS_ALL CACHE) -set(IE_CPACK_IE_DIR deployment_tools/inference_engine) +if (NOT DEFINED IE_CPACK_IE_DIR) + set(IE_CPACK_IE_DIR deployment_tools/inference_engine) +endif() # # ie_cpack_set_library_dir() @@ -17,8 +19,8 @@ function(ie_cpack_set_library_dir) set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) else() - set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) - set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) + set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) + set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) endif() endfunction() diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake index a66d2568d9..c3aad14bab 100644 --- a/cmake/developer_package/plugins/plugins.cmake +++ b/cmake/developer_package/plugins/plugins.cmake @@ -106,7 +106,7 @@ function(ie_add_plugin) install(TARGETS ${IE_PLUGIN_NAME} RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component} - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}) + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component}) endif() endfunction() diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt index aff7229c9f..f45a215f68 100644 --- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt +++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt @@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) if(COMMAND add_cpplint_target) add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) endif() + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt index 6bc44019fe..ca5ab34704 100644 --- a/inference-engine/samples/CMakeLists.txt +++ b/inference-engine/samples/CMakeLists.txt @@ -33,7 +33,7 @@ endif() if(IE_MAIN_SOURCE_DIR) # in case if samples are built from IE repo - set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR}) + set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR}) # hint for find_package(InferenceEngine in the samples folder) set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") # hint for find_package(ngraph in the samples folder) @@ -251,6 +251,8 @@ macro(ie_add_sample) add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} CUSTOM_FILTERS ${custom_filters}) endif() + + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) endmacro() # collect all samples subdirectories diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt index c5c5449677..06ecab13b5 100644 --- a/inference-engine/samples/common/format_reader/CMakeLists.txt +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt @@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} FOLDER cpp_samples) + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt index 1ea3227631..aa64718940 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt @@ -254,8 +254,8 @@ install(TARGETS ${TARGET_NAME} install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" - DESTINATION ${IE_CPACK_IE_DIR}/share + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine COMPONENT core) install(FILES $/plugins.xml - DESTINATION ${IE_CPACK_RUNTIME_PATH} + DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT core) diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt index 973fafcbf5..81aea3471a 100644 --- a/inference-engine/src/preprocessing/CMakeLists.txt +++ b/inference-engine/src/preprocessing/CMakeLists.txt @@ -185,4 +185,4 @@ ie_developer_export_targets(${TARGET_NAME}) install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt index 7721b7df6d..bf6543efa8 100644 --- a/inference-engine/src/readers/ir_reader/CMakeLists.txt +++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt @@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt index d8a5f2ec1d..2db7ddea6f 100644 --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt @@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL # install if (LINUX) install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules - DESTINATION ${IE_CPACK_IE_DIR}/external + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d COMPONENT myriad) endif() diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt index c9a92b4857..2b4fcc4d01 100644 --- a/inference-engine/tests/unit/cpu/CMakeLists.txt +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt @@ -25,3 +25,5 @@ addIeTargetTest( ie_faster_build(${TARGET_NAME} UNITY ) + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt index 1d9515f540..c81cb2ed79 100644 --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt @@ -26,3 +26,5 @@ addIeTargetTest( LABELS IE ) + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt index 5be30a3092..6a01e280ae 100644 --- a/inference-engine/tests/unit/vpu/CMakeLists.txt +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt @@ -35,3 +35,5 @@ addIeTargetTest( VPU MYRIAD ) + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt index 58614d3ced..9dfa068e4d 100644 --- a/inference-engine/tools/compile_tool/CMakeLists.txt +++ b/inference-engine/tools/compile_tool/CMakeLists.txt @@ -49,7 +49,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) # install install(TARGETS compile_tool - RUNTIME DESTINATION deployment_tools/tools/compile_tool + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT core) install(FILES README.md -- 2.29.0