From 3ca5cf1a61dcde80858a045f449e73cb36e50f02 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Fri, 26 Apr 2024 08:01:37 +0200 Subject: [PATCH] CMake: Temporary fix for fast-feedback-indexer --- image_analysis/CMakeLists.txt | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/image_analysis/CMakeLists.txt b/image_analysis/CMakeLists.txt index 49c744c2..8a9819fd 100644 --- a/image_analysis/CMakeLists.txt +++ b/image_analysis/CMakeLists.txt @@ -17,9 +17,29 @@ TARGET_LINK_LIBRARIES(JFJochImageAnalysis JFJochCommon) TARGET_INCLUDE_DIRECTORIES(JFJochImageAnalysis PUBLIC fast-feedback-indexer/eigen) IF (CMAKE_CUDA_COMPILER) - INCLUDE_DIRECTORIES(fast-feedback-indexer) - TARGET_LINK_LIBRARIES(JFJochImageAnalysis fast_indexer_static) - TARGET_INCLUDE_DIRECTORIES(JFJochImageAnalysis PUBLIC fast-feedback-indexer/indexer/src) + TARGET_SOURCES(JFJochImageAnalysis PRIVATE + fast-feedback-indexer/indexer/src/indexer.cpp + fast-feedback-indexer/indexer/src/indexer_gpu.cu + fast-feedback-indexer/indexer/src/log.cpp) + + TARGET_SOURCES(JFJochImageAnalysis PUBLIC + fast-feedback-indexer/indexer/src/ffbidx/indexer.h + fast-feedback-indexer/indexer/src/ffbidx/indexer_gpu.h + fast-feedback-indexer/indexer/src/ffbidx/refine.h + fast-feedback-indexer/indexer/src/ffbidx/log.h + fast-feedback-indexer/indexer/src/ffbidx/exception.h) + + ADD_CUSTOM_TARGET(version_txt + ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/fast-feedback-indexer/indexer/src/version.h.in + -D DST=${CMAKE_CURRENT_SOURCE_DIR}/fast-feedback-indexer/indexer/src/ffbidx/version.h + -P ${CMAKE_CURRENT_SOURCE_DIR}/fast-feedback-indexer/indexer/src/GenerateVersionH.cmake + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fast-feedback-indexer + ) + ADD_DEPENDENCIES(JFJochImageAnalysis version_txt) + TARGET_COMPILE_DEFINITIONS(JFJochImageAnalysis PUBLIC -DVECTOR_CANDIDATE_REFINEMENT=1) + TARGET_INCLUDE_DIRECTORIES(JFJochImageAnalysis PUBLIC fast-feedback-indexer/indexer/src/) + + TARGET_LINK_LIBRARIES(JFJochImageAnalysis ${CUDART_LIBRARY} ${CMAKE_DL_LIBS} rt) ELSE() MESSAGE(WARNING "CUDA is strongly recommended for image analysis." ) ENDIF()