CMAKE: moved GNA var setting to proper place; removed find_package when build python...

[platform/upstream/dldt.git] / inference-engine / ie_bridges / python / src / openvino / tools / statistics_collector / CMakeLists.txt

diff --git a/inference-engine/ie_bridges/python/src/openvino/tools/statistics_collector/CMakeLists.txt b/inference-engine/ie_bridges/python/src/openvino/tools/statistics_collector/CMakeLists.txt
index bdd6a3f..72ddfea 100644 (file)
--- a/inference-engine/ie_bridges/python/src/openvino/tools/statistics_collector/CMakeLists.txt
+++ b/inference-engine/ie_bridges/python/src/openvino/tools/statistics_collector/CMakeLists.txt
@@ -1,29 +1,24 @@
-# If the pyx file is a C++ file, we should specify that here.
-set (CMAKE_INCLUDE_CURRENT_DIR ON)
-set (TARGET_NAME "statistics_collector_api")
-
-set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY}/tools/statistics_collector)
-set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-
-file(GLOB SOURCE
-        ${CMAKE_CURRENT_SOURCE_DIR}/*.pyx
-        )
-
-set_source_files_properties(${SOURCE} PROPERTIES CYTHON_IS_CXX TRUE
-)
-include_directories (
-    ${IE_MAIN_SOURCE_DIR}/samples/common
-)
-
-## Compatibility with python 2.7 which has deprecated "register" specifier
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    add_definitions("-Wno-register")
-endif()
+# Copyright (C) 2019 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+set(TARGET_NAME "statistics_collector_api")
+
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY}/tools/statistics_collector)
+
+file(GLOB SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/*.pyx)
 
-cython_add_module (${TARGET_NAME} ${SOURCE})
+set_source_files_properties(${SOURCE} PROPERTIES CYTHON_IS_CXX ON)
 
-set_target_properties (${TARGET_NAME} PROPERTIES CXX_STANDARD 11 LINKER_LANGUAGE CXX)
-target_link_libraries (${TARGET_NAME} PRIVATE ${InferenceEngine_LIBRARIES})
+# create target
+
+cython_add_module(${TARGET_NAME} ${SOURCE})
+
+set_target_properties(${TARGET_NAME} PROPERTIES CXX_STANDARD 11 LINKER_LANGUAGE CXX)
+
+# Compatibility with python 2.7 which has deprecated "register" specifier
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    target_compile_options(${TARGET_NAME} PRIVATE "-Wno-register")
+endif()
 
 if(TARGET IE::statistics_collector_s)
        target_link_libraries(${TARGET_NAME} PRIVATE IE::statistics_collector_s)
@@ -32,7 +27,7 @@ else()
 endif()
 
 # perform copy
-ADD_CUSTOM_COMMAND (TARGET ${TARGET_NAME}
+add_custom_command(TARGET ${TARGET_NAME}
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/tools/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../__init__.py
     COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/tools/statistics_collector/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py