Skip to content

Commit b58bb22

Browse files
committed
Slight cuda-related CMake cleanup
1 parent 150704e commit b58bb22

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

CMakeLists.txt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,7 @@ if (CMAKE_CUDA_COMPILER)
477477
)
478478
target_link_libraries(libvis_cuda PUBLIC
479479
libvis
480+
CUDA::cublas
480481
)
481482
target_compile_options(libvis_cuda PRIVATE
482483
$<$<COMPILE_LANGUAGE:CUDA>:-use_fast_math>
@@ -497,14 +498,12 @@ if (CMAKE_CUDA_COMPILER)
497498
gtest_main
498499
Threads::Threads
499500
libvis_cuda
500-
CUDA::cublas # TODO: currently required because of lm_optimizer.h. That should not be necessary.
501501
)
502502
target_include_directories(libvis_cuda_test PRIVATE
503503
${gtest_SOURCE_DIR}/include
504504
#${gtest_SOURCE_DIR}
505505
${OpenCV_INCLUDE_DIRS}
506506
${GLEW_INCLUDE_DIRS}
507-
${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES} # TODO: currently required because of lm_optimizer.h. That should not be necessary.
508507
)
509508
add_test(libvis_cuda_test
510509
libvis_cuda_test
@@ -539,14 +538,6 @@ target_link_libraries(libvis_test PRIVATE
539538
Threads::Threads
540539
libvis
541540
)
542-
if(CMAKE_CUDA_COMPILER)
543-
target_link_libraries(libvis_test PRIVATE
544-
CUDA::cublas # TODO: currently required because of lm_optimizer.h. That should not be necessary.
545-
)
546-
target_include_directories(libvis_test PRIVATE
547-
${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES} # TODO: currently required because of lm_optimizer.h. That should not be necessary.
548-
)
549-
endif()
550541
target_include_directories(libvis_test PRIVATE
551542
${gtest_SOURCE_DIR}/include
552543
#${gtest_SOURCE_DIR}

0 commit comments

Comments
 (0)