CMake: minor CUDA fixes
This commit is contained in:
@@ -18,6 +18,8 @@ SET(CMAKE_CUDA_FLAGS_RELEASE "-O3")
|
||||
IF (CMAKE_CUDA_COMPILER)
|
||||
ENABLE_LANGUAGE(CUDA)
|
||||
MESSAGE(STATUS "CUDA VERSION: ${CMAKE_CUDA_COMPILER_VERSION}")
|
||||
ADD_COMPILE_DEFINITIONS(-DJFJOCH_USE_CUDA)
|
||||
FIND_LIBRARY(CUDART_LIBRARY cudart_static PATHS ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES} REQUIRED)
|
||||
ENDIF()
|
||||
|
||||
SET(JFJOCH_COMPILE_WRITER ON CACHE BOOL "Compile HDF5 writer")
|
||||
|
||||
@@ -13,8 +13,6 @@ TARGET_INCLUDE_DIRECTORIES(ImageAnalysis PUBLIC fast-feedback-indexer/eigen)
|
||||
IF (CMAKE_CUDA_COMPILER)
|
||||
TARGET_SOURCES(ImageAnalysis PRIVATE GPUImageAnalysis.cu )
|
||||
|
||||
TARGET_COMPILE_DEFINITIONS(ImageAnalysis PUBLIC -DJFJOCH_USE_CUDA)
|
||||
|
||||
TARGET_SOURCES(ImageAnalysis PRIVATE
|
||||
fast-feedback-indexer/indexer/src/indexer.cpp
|
||||
fast-feedback-indexer/indexer/src/indexer_gpu.cu
|
||||
@@ -29,7 +27,6 @@ IF (CMAKE_CUDA_COMPILER)
|
||||
|
||||
TARGET_INCLUDE_DIRECTORIES(ImageAnalysis PUBLIC fast-feedback-indexer/indexer/src/)
|
||||
|
||||
FIND_LIBRARY(CUDART_LIBRARY cudart_static PATHS ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES} REQUIRED)
|
||||
TARGET_LINK_LIBRARIES(ImageAnalysis ${CUDART_LIBRARY} ${CMAKE_DL_LIBS} rt)
|
||||
ELSE()
|
||||
MESSAGE(WARNING "CUDA is strongly recommended for image analysis." )
|
||||
|
||||
@@ -15,9 +15,5 @@ TARGET_LINK_LIBRARIES(JFCalibration JFJochProtoBuf Compression)
|
||||
|
||||
IF (CMAKE_CUDA_COMPILER)
|
||||
TARGET_SOURCES(JFCalibration PRIVATE JFConversionGPU.cu )
|
||||
|
||||
TARGET_COMPILE_DEFINITIONS(JFCalibration PUBLIC -DJFJOCH_USE_CUDA)
|
||||
|
||||
FIND_LIBRARY(CUDART_LIBRARY cudart_static PATHS ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES} REQUIRED)
|
||||
TARGET_LINK_LIBRARIES(JFCalibration ${CUDART_LIBRARY} ${CMAKE_DL_LIBS} rt)
|
||||
ENDIF()
|
||||
|
||||
Reference in New Issue
Block a user