From 5dfb291a56ae7f0651ff61ce7c190900c7bbf9b6 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Wed, 18 Nov 2020 12:24:30 +0300 Subject: [PATCH] Added EXCLUDE_FROM_ALL for static versions of plugins (#3174) --- inference-engine/src/gna_plugin/CMakeLists.txt | 3 ++- inference-engine/src/inference_engine/CMakeLists.txt | 2 ++ inference-engine/src/mkldnn_plugin/CMakeLists.txt | 2 ++ inference-engine/src/preprocessing/CMakeLists.txt | 2 ++ inference-engine/src/vpu/common/CMakeLists.txt | 1 + inference-engine/src/vpu/graph_transformer/CMakeLists.txt | 1 + ngraph/test/runtime/CMakeLists.txt | 2 +- 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/inference-engine/src/gna_plugin/CMakeLists.txt b/inference-engine/src/gna_plugin/CMakeLists.txt index dfd15e6bbf0..f5625436e66 100644 --- a/inference-engine/src/gna_plugin/CMakeLists.txt +++ b/inference-engine/src/gna_plugin/CMakeLists.txt @@ -64,7 +64,8 @@ target_include_directories(${TARGET_NAME}_test_static PUBLIC ${CMAKE_CURRENT_SOU set_target_properties(${TARGET_NAME}_test_static PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_test_static) set_target_properties(${TARGET_NAME} ${TARGET_NAME}_test_static - PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) + PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO} + EXCLUDE_FROM_ALL ON) # install diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt index 32c53b8ad30..b0e6fdfb96c 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt @@ -178,6 +178,8 @@ target_link_libraries(${TARGET_NAME}_s PRIVATE openvino::itt ${CMAKE_DL_LIBS} ${ target_compile_definitions(${TARGET_NAME}_s PUBLIC USE_STATIC_IE) +set_target_properties(${TARGET_NAME}_s PROPERTIES EXCLUDE_FROM_ALL ON) + # LTO set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj ${TARGET_NAME}_s diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt index f52926d6d2a..2b0743b1280 100644 --- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt +++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt @@ -207,6 +207,8 @@ set_ie_threading_interface_for(${TARGET_NAME}_obj) target_compile_definitions(${TARGET_NAME}_obj PUBLIC -DMKLDNN_THR=${MKLDNN_THR} PRIVATE USE_STATIC_IE IMPLEMENT_INFERENCE_ENGINE_PLUGIN) +set_target_properties(${TARGET_NAME}_obj PROPERTIES EXCLUDE_FROM_ALL ON) + # LTO set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt index d47dfb357f7..1d64cb5503b 100644 --- a/inference-engine/src/preprocessing/CMakeLists.txt +++ b/inference-engine/src/preprocessing/CMakeLists.txt @@ -169,6 +169,8 @@ target_link_libraries(${TARGET_NAME}_s PRIVATE fluid openvino::itt target_compile_definitions(${TARGET_NAME}_s INTERFACE USE_STATIC_IE) +set_target_properties(${TARGET_NAME}_s PROPERTIES EXCLUDE_FROM_ALL ON) + # LTO set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj ${TARGET_NAME}_s diff --git a/inference-engine/src/vpu/common/CMakeLists.txt b/inference-engine/src/vpu/common/CMakeLists.txt index bd97c2c6b38..5b8267bbb87 100644 --- a/inference-engine/src/vpu/common/CMakeLists.txt +++ b/inference-engine/src/vpu/common/CMakeLists.txt @@ -26,6 +26,7 @@ function(add_common_target TARGET_NAME STATIC_IE) target_compile_definitions(${TARGET_NAME} PUBLIC USE_STATIC_IE) + set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) endif() target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN) diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt index 797ef9750f1..ec799a6ac54 100644 --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt @@ -22,6 +22,7 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) target_compile_definitions(${TARGET_NAME} PUBLIC USE_STATIC_IE) + set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) endif() target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN) diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt index d27ea8090c0..3f1776932ce 100644 --- a/ngraph/test/runtime/CMakeLists.txt +++ b/ngraph/test/runtime/CMakeLists.txt @@ -73,7 +73,7 @@ target_link_libraries(ngraph_backend PUBLIC ngraph ngraph::builder ngraph::reference) if (NOT WIN32) - target_link_libraries(ngraph_backend PRIVATE dl) + target_link_libraries(ngraph_backend PRIVATE ${CMAKE_DL_LIBS}) endif() target_compile_definitions(ngraph_backend PRIVATE BACKEND_DLL_EXPORTS) target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})