Publishing 2020.1 content

inference-engine/thirdparty/movidius/mvnc/CMakeLists.txt

@@ -1,60 +1,32 @@
-# Copyright (C) 2018-2019 Intel Corporation
+# Copyright (C) 2018-2020 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
 set(TARGET_NAME "mvnc")
 
-if(NOT WIN32)
-    find_package(Threads REQUIRED)
+include(${XLINK_DIR}/XLink.cmake)
 
-    find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "include" "libusb" "libusb-1.0")
-    find_library(LIBUSB_LIBRARY NAMES usb-1.0 PATH_SUFFIXES "lib")
+file(GLOB_RECURSE MVNC_SOURCES "include/*" "src/*")
 
-    if(NOT LIBUSB_INCLUDE_DIR OR NOT LIBUSB_LIBRARY)
-        message(FATAL_ERROR "libusb it required for Myriad plugin build")
-    endif()
-endif()
+set(WATCHDOG_INCLUDE
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/watchdog/)
 
-file(GLOB MVNC_SOURCES "include/*" "src/*")
-file(GLOB WATCHDOG_SOURCES "../watchdog/*")
-
-if(WIN32)
-    file(GLOB USB_WIN_SOURCES "../USB_WIN/*")
-    file(GLOB WIN_PTHREAD_SOURCES "../WinPthread/*")
-    list(APPEND ${MVNC_SOURCES} ${USB_WIN_SOURCES} ${WIN_PTHREAD_SOURCES})
-else()
-    list(APPEND ${MVNC_SOURCES}  "../WinPthread/pthread_semaphore.c")
-endif()
-
-add_library(${TARGET_NAME} STATIC ${MVNC_SOURCES} ${WATCHDOG_SOURCES})
+add_library(${TARGET_NAME} STATIC ${MVNC_SOURCES})
 
 target_include_directories(${TARGET_NAME}
-    PUBLIC
+        PUBLIC
         "include"
-    PRIVATE
-        "../watchdog")
-
-if(WIN32)
-    target_include_directories(${TARGET_NAME}
-            PRIVATE
-            "../USB_WIN"
-            "../WinPthread")
-endif()
-
-if(UNIX)
-    target_include_directories(${TARGET_NAME}
         PRIVATE
-            "../WinPthread"
-            "${LIBUSB_INCLUDE_DIR}")
-endif()
+        ${XLINK_INCLUDE}
+        ${XLINK_PLATFORM_INCLUDE}
+        ${WATCHDOG_INCLUDE})
 
 target_compile_definitions(${TARGET_NAME}
-    PRIVATE
+        PRIVATE
         __PC__
         HAVE_STRUCT_TIMESPEC
-        _CRT_SECURE_NO_WARNINGS)
-
-target_compile_definitions(${TARGET_NAME} PRIVATE USE_USB_VSC)
+        _CRT_SECURE_NO_WARNINGS
+        USE_USB_VSC)
 
 if (ENABLE_MYRIAD_NO_BOOT)
     target_compile_definitions(${TARGET_NAME} PRIVATE NO_BOOT)
@@ -62,46 +34,41 @@ endif()
 
 if(NOT WIN32)
     target_compile_options(${TARGET_NAME}
-        PRIVATE
+            PRIVATE
             -MMD
             -MP
             -Wformat
             -Wformat-security
             -Wall)
-    if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.8)
+    if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.8.5)
         target_compile_options(${TARGET_NAME}
-            PRIVATE
+                PRIVATE
                 -fstack-protector-strong)
     else()
         target_compile_options(${TARGET_NAME}
-            PRIVATE
+                PRIVATE
                 -fstack-protector)
     endif()
 
     set_property(TARGET ${TARGET_NAME}
-        PROPERTY LINK_FLAGS
+            PROPERTY LINK_FLAGS
             -z noexecstack
             -z relro
             -z now)
 endif()
 
 set_target_properties(${TARGET_NAME} PROPERTIES
-    POSITION_INDEPENDENT_CODE TRUE
-    COMPILE_PDB_NAME ${TARGET_NAME})
-
+        POSITION_INDEPENDENT_CODE TRUE
+        COMPILE_PDB_NAME ${TARGET_NAME})
 
 target_link_libraries(${TARGET_NAME}
         PRIVATE
-            XLink)
+        XLink)
 
 if(NOT WIN32)
     target_link_libraries(${TARGET_NAME}
-        PUBLIC
+            PUBLIC
             Threads::Threads
             ${CMAKE_DL_LIBS}
             ${LIBUSB_LIBRARY})
 endif()
-
-if(ENABLE_TESTS AND ENABLE_MYRIAD_MVNC_TESTS)
-    add_subdirectory(tests)
-endif()