|
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
|
--- test/CMakeLists.txt.orig 2018-06-22 15:12:37 UTC
|
|
|
|
|
--- test/CMakeLists.txt.orig 2019-02-04 09:16:01 UTC
|
|
|
|
|
+++ test/CMakeLists.txt
|
|
|
|
|
@@ -8,12 +8,13 @@
|
|
|
|
|
|
|
|
|
|
@@ -19,20 +19,20 @@
|
|
|
|
|
|
|
|
|
|
message(STATUS "Forcing tests build type to Release")
|
|
|
|
|
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
|
|
|
|
|
@@ -174,7 +175,7 @@ add_custom_target(
|
|
|
|
|
foreach(filename IN LISTS XTENSOR_TESTS)
|
|
|
|
|
@@ -192,7 +193,7 @@ foreach(filename IN LISTS XTENSOR_TESTS)
|
|
|
|
|
string(REPLACE ".cpp" "" targetname ${filename})
|
|
|
|
|
add_executable(${targetname} ${COMMON_BASE} ${filename} ${XTENSOR_HEADERS})
|
|
|
|
|
target_include_directories(${targetname} PRIVATE ${XTENSOR_INCLUDE_DIR})
|
|
|
|
|
- target_link_libraries(${targetname} xtensor ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
|
|
|
|
+ target_link_libraries(${targetname} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
|
|
|
|
if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
|
|
|
|
|
add_dependencies(${targetname} gtest_main)
|
|
|
|
|
endif()
|
|
|
|
|
@@ -188,6 +189,6 @@ add_executable(${XTENSOR_TARGET} ${COMMO
|
|
|
|
|
@@ -207,6 +208,6 @@ target_include_directories(test_xtensor_
|
|
|
|
|
if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
|
|
|
|
|
add_dependencies(${XTENSOR_TARGET} gtest_main)
|
|
|
|
|
add_dependencies(test_xtensor_lib gtest_main)
|
|
|
|
|
endif()
|
|
|
|
|
-target_link_libraries(${XTENSOR_TARGET} xtensor ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
|
|
|
|
+target_link_libraries(${XTENSOR_TARGET} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
|
|
|
|
-target_link_libraries(test_xtensor_lib xtensor ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
|
|
|
|
+target_link_libraries(test_xtensor_lib ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
|
|
|
|
|
|
|
|
|
add_custom_target(xtest COMMAND ${XTENSOR_TARGET} DEPENDS ${XTENSOR_TARGET})
|
|
|
|
|
add_custom_target(xtest COMMAND test_xtensor_lib DEPENDS test_xtensor_lib)
|
|
|
|
|
|