mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
Properly fix merge issues.
This commit is contained in:
@@ -1,3 +1,17 @@
|
||||
# generate split test header file only if it does not yet exist
|
||||
# in order to prevent a rebuild everytime cmake is configured
|
||||
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/split_test_helper.h)
|
||||
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/split_test_helper.h "")
|
||||
foreach(i RANGE 1 999)
|
||||
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/split_test_helper.h
|
||||
"#ifdef EIGEN_TEST_PART_${i}\n"
|
||||
"#define CALL_SUBTEST_${i}(FUNC) CALL_SUBTEST(FUNC)\n"
|
||||
"#else\n"
|
||||
"#define CALL_SUBTEST_${i}(FUNC)\n"
|
||||
"#endif\n\n"
|
||||
)
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
set_property(GLOBAL PROPERTY EIGEN_CURRENT_SUBPROJECT "Unsupported")
|
||||
add_custom_target(BuildUnsupported)
|
||||
@@ -161,7 +175,7 @@ endif()
|
||||
# These tests needs nvcc
|
||||
find_package(CUDA 7.0)
|
||||
if(CUDA_FOUND)
|
||||
set(CUDA_PROPAGATE_HOST_FLAGS OFF)
|
||||
# set(CUDA_PROPAGATE_HOST_FLAGS OFF)
|
||||
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
set(CUDA_NVCC_FLAGS "-ccbin /usr/bin/clang" CACHE STRING "nvcc flags" FORCE)
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user