merge dks-1.0.0-branch (fix conflicts)
This commit is contained in:
@ -83,4 +83,4 @@ TARGET_LINK_LIBRARIES(testFFTSolverMIC dks ${Boost_LIBRARIES} ${CLFFT_LIBRARIES}
|
||||
#IF (NOT CUDA_VERSION VERSION_LESS "7.0")
|
||||
#ADD_EXECUTABLE(testChiSquareRT testChiSquareRT.cpp)
|
||||
#TARGET_LINK_LIBRARIES(testChiSquareRT dks)
|
||||
#ENDIF (NOT CUDA_VERSION VERSION_LESS "7.0")
|
||||
#ENDIF (NOT CUDA_VERSION VERSION_LESS "7.0")
|
||||
|
Reference in New Issue
Block a user