--- test/CMakeLists.txt.orig 2020-11-08 16:48:28 UTC +++ test/CMakeLists.txt @@ -14,8 +14,8 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR enable_testing() - find_package(xtensor REQUIRED CONFIG) - set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIRS}) + #find_package(xtensor REQUIRED CONFIG) + #set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIRS}) endif () if(NOT CMAKE_BUILD_TYPE) @@ -296,7 +296,7 @@ foreach(filename IN LISTS COMMON_BASE XTENSOR_TESTS) add_dependencies(${targetname} gtest_main) endif() target_include_directories(${targetname} PRIVATE ${XTENSOR_INCLUDE_DIR}) - target_link_libraries(${targetname} PRIVATE xtensor GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(${targetname} PRIVATE GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT}) add_custom_target( x${targetname} COMMAND ${targetname} @@ -326,7 +326,7 @@ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) endif() target_include_directories(test_xtensor_lib PRIVATE ${XTENSOR_INCLUDE_DIR}) -target_link_libraries(test_xtensor_lib PRIVATE xtensor GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(test_xtensor_lib PRIVATE GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT}) add_custom_target(xtest COMMAND test_xtensor_lib DEPENDS test_xtensor_lib) add_test(NAME xtest COMMAND test_xtensor_lib) @@ -341,5 +341,5 @@ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) add_dependencies(test_xtensor_core_lib gtest_main) endif() -target_link_libraries(test_xtensor_core_lib PRIVATE xtensor GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(test_xtensor_core_lib PRIVATE GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT}) add_custom_target(coverity COMMAND coverity_scan DEPENDS test_xtensor_core_lib)