diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt index 55e218daa2c..32e43d2dbb3 100644 --- a/ngraph/CMakeLists.txt +++ b/ngraph/CMakeLists.txt @@ -325,15 +325,6 @@ if (NGRAPH_ONNX_IMPORT_ENABLE) endif() add_subdirectory(frontend) - -if(NGRAPH_UNIT_TEST_ENABLE) - set(BEFORE_GTEST_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) - set(BUILD_SHARED_LIBS OFF) - include(cmake/external_gtest.cmake) - set(BUILD_SHARED_LIBS ${BEFORE_GTEST_BUILD_SHARED_LIBS}) - unset(BEFORE_GTEST_BUILD_SHARED_LIBS) -endif() - add_subdirectory(test) if (NGRAPH_PYTHON_BUILD_ENABLE) diff --git a/ngraph/cmake/external_gtest.cmake b/ngraph/cmake/external_gtest.cmake deleted file mode 100644 index 529d577cdd9..00000000000 --- a/ngraph/cmake/external_gtest.cmake +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright (C) 2018-2021 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 -# - -# Enable ExternalProject CMake module -include(ExternalProject) - -#------------------------------------------------------------------------------ -# Download and install GoogleTest ... -#------------------------------------------------------------------------------ - -SET(GTEST_GIT_REPO_URL https://github.com/google/googletest.git) -SET(GTEST_GIT_LABEL release-1.8.1) - -set(GMOCK_OUTPUT_DIR ${EXTERNAL_PROJECTS_ROOT}/gtest/build/googlemock) -set(GTEST_OUTPUT_DIR ${GMOCK_OUTPUT_DIR}/gtest) - -if(WIN32) - list(APPEND GTEST_CMAKE_ARGS - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE=${GTEST_OUTPUT_DIR} - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO=${GTEST_OUTPUT_DIR} - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG=${GTEST_OUTPUT_DIR} - -Dgtest_force_shared_crt=TRUE - ) - set(GMOCK_OUTPUT_DIR ${GTEST_OUTPUT_DIR}) -endif() - -if(CMAKE_BUILD_TYPE) - list(APPEND GTEST_CMAKE_ARGS - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - ) -endif() - -# Build for ninja -SET(GTEST_PATHS ${GTEST_OUTPUT_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtestd${CMAKE_STATIC_LIBRARY_SUFFIX} - ${GMOCK_OUTPUT_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmockd${CMAKE_STATIC_LIBRARY_SUFFIX} - ${GTEST_OUTPUT_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX} - ${GMOCK_OUTPUT_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}) - -ExternalProject_Add( - ext_gtest - PREFIX gtest - GIT_REPOSITORY ${GTEST_GIT_REPO_URL} - GIT_TAG ${GTEST_GIT_LABEL} - # Disable install step - INSTALL_COMMAND "" - UPDATE_COMMAND "" - CMAKE_GENERATOR ${CMAKE_GENERATOR} - CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM} - CMAKE_GENERATOR_TOOLSET ${CMAKE_GENERATOR_TOOLSET} - CMAKE_ARGS - ${NGRAPH_FORWARD_CMAKE_ARGS} - -DCMAKE_CXX_FLAGS=${GTEST_CXX_FLAGS} - ${GTEST_CMAKE_ARGS} - BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/build" - EXCLUDE_FROM_ALL TRUE - BUILD_BYPRODUCTS ${GTEST_PATHS} - ) - -#------------------------------------------------------------------------------ - -ExternalProject_Get_Property(ext_gtest SOURCE_DIR BINARY_DIR) - -add_library(libgtest INTERFACE) -add_dependencies(libgtest ext_gtest ext_gmock) -target_include_directories(libgtest SYSTEM INTERFACE - ${SOURCE_DIR}/googletest/include - ${SOURCE_DIR}/googlemock/include) - -if(LINUX OR APPLE OR WIN32) - target_link_libraries(libgtest INTERFACE - debug ${GTEST_OUTPUT_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtestd${CMAKE_STATIC_LIBRARY_SUFFIX} - debug ${GMOCK_OUTPUT_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmockd${CMAKE_STATIC_LIBRARY_SUFFIX} - optimized ${GTEST_OUTPUT_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX} - optimized ${GMOCK_OUTPUT_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}) -else() - message(FATAL_ERROR "libgtest: Unsupported platform.") -endif() diff --git a/ngraph/test/util/CMakeLists.txt b/ngraph/test/util/CMakeLists.txt index 91f790a1185..8006d2738ff 100644 --- a/ngraph/test/util/CMakeLists.txt +++ b/ngraph/test/util/CMakeLists.txt @@ -31,7 +31,7 @@ if(NGRAPH_LIB_VERSIONING_ENABLE) VERSION ${NGRAPH_VERSION}) endif() target_include_directories(ngraph_test_util PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ${IE_MAIN_SOURCE_DIR}/include) -target_link_libraries(ngraph_test_util PUBLIC ngraph ngraph_backend libgtest) +target_link_libraries(ngraph_test_util PUBLIC ngraph ngraph_backend gtest gmock) if (NGRAPH_ONNX_IMPORT_ENABLE) target_link_libraries(ngraph_test_util PRIVATE onnx_common) endif()