From 626184cf0e8c97b23cf0e7be4fb3e73f7e6748ee 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 -------- .../IEDevScriptsConfig.cmake | 2 +- cmake/developer_package/packaging.cmake | 8 +++-- cmake/developer_package/plugins/plugins.cmake | 2 +- .../common/opencv_c_wrapper/CMakeLists.txt | 2 ++ inference-engine/samples/CMakeLists.txt | 4 ++- .../common/format_reader/CMakeLists.txt | 4 ++- .../src/inference_engine/CMakeLists.txt | 35 ++----------------- .../src/preprocessing/CMakeLists.txt | 2 +- .../src/readers/ir_reader/CMakeLists.txt | 2 +- .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- .../tests/unit/cpu/CMakeLists.txt | 2 ++ .../unit/inference_engine/CMakeLists.txt | 2 ++ .../tests/unit/vpu/CMakeLists.txt | 2 ++ .../tools/compile_tool/CMakeLists.txt | 2 +- ngraph/CMakeLists.txt | 8 ++--- 16 files changed, 32 insertions(+), 62 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0706a72e8..7920de9a42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,12 +180,7 @@ 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 @@ -195,22 +190,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 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 0e1fe76db2..97867a24f8 100644 --- a/cmake/developer_package/IEDevScriptsConfig.cmake +++ b/cmake/developer_package/IEDevScriptsConfig.cmake @@ -124,7 +124,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 2b5e945b17..adc4bef0bc 100644 --- a/cmake/developer_package/packaging.cmake +++ b/cmake/developer_package/packaging.cmake @@ -5,7 +5,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() @@ -18,8 +20,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 aae1dbb7fb..e6dac2a478 100644 --- a/cmake/developer_package/plugins/plugins.cmake +++ b/cmake/developer_package/plugins/plugins.cmake @@ -124,7 +124,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_wrapper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt index 45b2b3e9ed..55f7dfd214 100644 --- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt +++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt @@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) add_clang_format_target(${TARGET_NAME}_clang 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 ae93857944..fba24c6fed 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) @@ -256,6 +256,8 @@ macro(ie_add_sample) if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS}) 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 d75061e56c..a2f8bd6397 100644 --- a/inference-engine/samples/common/format_reader/CMakeLists.txt +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt @@ -44,4 +44,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} if(COMMAND add_clang_format_target) add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) -endif() \ No newline at end of file +endif() + +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 5d044e097c..103c187913 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt @@ -227,35 +227,6 @@ list(APPEND core_components ngraph) list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR" "IE_PARALLEL_CMAKE") -if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP}) - ie_cpack_add_component(tbb REQUIRED) - list(APPEND core_components tbb) - - install(DIRECTORY "${TBB}/include" - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb - COMPONENT tbb) - install(DIRECTORY "${TBB}/lib" - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb - COMPONENT tbb) - if(EXISTS "${TBB}/bin") - install(DIRECTORY "${TBB}/bin" - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb - COMPONENT tbb) - endif() - install(FILES "${TBB}/LICENSE" - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb - COMPONENT tbb) - - set(IE_TBB_DIR_INSTALL "external/tbb/cmake") - set(IE_TBB_DIR "${TBB_DIR}") - list(APPEND PATH_VARS "IE_TBB_DIR") - - install(FILES "${TBB}/cmake/TBBConfig.cmake" - "${TBB}/cmake/TBBConfigVersion.cmake" - DESTINATION ${IE_CPACK_IE_DIR}/${IE_TBB_DIR_INSTALL} - COMPONENT tbb) -endif() - # Install Inference Engine ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) @@ -270,7 +241,7 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) install(FILES $/plugins.xml - DESTINATION ${IE_CPACK_RUNTIME_PATH} + DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT core) # Install cmake scripts @@ -278,7 +249,7 @@ install(FILES $/plugins.xml install(EXPORT InferenceEngineTargets FILE InferenceEngineTargets.cmake NAMESPACE IE:: - DESTINATION ${IE_CPACK_IE_DIR}/share + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine COMPONENT core_dev) set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph") @@ -307,5 +278,5 @@ configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-vers install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake" - DESTINATION ${IE_CPACK_IE_DIR}/share + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine COMPONENT core_dev) diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt index f9548339d1..2670a04b60 100644 --- a/inference-engine/src/preprocessing/CMakeLists.txt +++ b/inference-engine/src/preprocessing/CMakeLists.txt @@ -184,4 +184,4 @@ ie_developer_export_targets(${TARGET_NAME}) install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${IE_CPACK_RUNTIME_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 6d2bd39f3c..0722702055 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 - 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 a3e0182ed9..1b0e241485 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 dfa8ce9d3f..88e7fbf67f 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 5c38c77b9b..927f93484f 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 fcb9f567bb..d4ac1952b8 100644 --- a/inference-engine/tests/unit/vpu/CMakeLists.txt +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt @@ -33,3 +33,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 6e6f384289..a76ba55e64 100644 --- a/inference-engine/tools/compile_tool/CMakeLists.txt +++ b/inference-engine/tools/compile_tool/CMakeLists.txt @@ -41,7 +41,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) ie_cpack_add_component(core_tools DEPENDS core) install(TARGETS compile_tool - RUNTIME DESTINATION deployment_tools/tools/compile_tool + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT core_tools) install(FILES README.md diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt index 830fb3eb36..3093596e4a 100644 --- a/ngraph/CMakeLists.txt +++ b/ngraph/CMakeLists.txt @@ -183,10 +183,10 @@ endif() message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}") # Destinations -set(NGRAPH_INSTALL_LIB "deployment_tools/ngraph/${CMAKE_INSTALL_LIBDIR}") -set(NGRAPH_INSTALL_INCLUDE "deployment_tools/ngraph/${CMAKE_INSTALL_INCLUDEDIR}") -set(NGRAPH_INSTALL_DOC "deployment_tools/ngraph/${CMAKE_INSTALL_DOCDIR}") -set(NGRAPH_INSTALL_BIN "deployment_tools/ngraph/${CMAKE_INSTALL_BINDIR}") +set(NGRAPH_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") +set(NGRAPH_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}") +set(NGRAPH_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}") +set(NGRAPH_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}") #----------------------------------------------------------------------------------------------- # Compile Flags for nGraph... -- 2.32.0