From 904cbcfb01eb61cb8275a2724c2dabf9aee28c30 Mon Sep 17 00:00:00 2001
From: Bram Veenboer <bram.veenboer@gmail.com>
Date: Wed, 4 Oct 2023 18:16:45 +0200
Subject: [PATCH] Fix compilation of OpenCLCorrelatorTest
---
test/OpenCLCorrelatorTest/CMakeLists.txt | 11 +++++++----
test/OpenCLCorrelatorTest/OpenCLCorrelatorTest.cc | 4 ++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/test/OpenCLCorrelatorTest/CMakeLists.txt b/test/OpenCLCorrelatorTest/CMakeLists.txt
index 255b6fd..f4092e0 100644
--- a/test/OpenCLCorrelatorTest/CMakeLists.txt
+++ b/test/OpenCLCorrelatorTest/CMakeLists.txt
@@ -1,13 +1,16 @@
+project(OpenCLCorrelatorTest)
find_package(OpenMP REQUIRED)
find_package(OpenCL)
if (${OpenCL_FOUND})
-add_executable(OpenCLCorrelatorTest)
-target_sources(OpenCLCorrelatorTest PRIVATE OpenCLCorrelatorTest.cc)
-target_include_directories(OpenCLCorrelatorTest PRIVATE ${CMAKE_SOURCE_DIR}
+set(KERNEL_SOURCE_FILE "${CMAKE_SOURCE_DIR}/libtcc/kernel/TCCorrelator.cu")
+add_executable(${PROJECT_NAME})
+target_sources(${PROJECT_NAME} PRIVATE OpenCLCorrelatorTest.cc)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}
${OpenCL_INCLUDE_DIRS})
-target_link_libraries(OpenCLCorrelatorTest PRIVATE ${OpenCL_LIBRARIES}
+target_link_libraries(${PROJECT_NAME} PRIVATE ${OpenCL_LIBRARIES}
OpenMP::OpenMP_CXX)
+target_compile_definitions(${PROJECT_NAME} PRIVATE KERNEL_SOURCE_FILE="${KERNEL_SOURCE_FILE}")
# FIXME: The OpenCLCorrelatorTest doesn't work
# add_test(
diff --git a/test/OpenCLCorrelatorTest/OpenCLCorrelatorTest.cc b/test/OpenCLCorrelatorTest/OpenCLCorrelatorTest.cc
index 90ead50..31a8dcc 100644
--- a/test/OpenCLCorrelatorTest/OpenCLCorrelatorTest.cc
+++ b/test/OpenCLCorrelatorTest/OpenCLCorrelatorTest.cc
@@ -247,8 +247,8 @@ cl::Program createProgramFromBinaries(cl::Context &context, std::vector<cl::Devi
<< " -DNR_SAMPLES_PER_CHANNEL=" << NR_SAMPLES_PER_CHANNEL
<< " -DNR_POLARIZATIONS=" << NR_POLARIZATIONS
<< " -DNR_RECEIVERS_PER_BLOCK=" << NR_RECEIVERS_PER_BLOCK
- << " -o -"
- << " libtcc/kernel/TCCorrelator.cu"
+ << " -o - "
+ << KERNEL_SOURCE_FILE
<< "|sed -e s/.param\\ .[a-zA-Z0-9]*/\\&\\ .ptr\\ .global/";
std::clog << "executing: " << command.str() << std::endl;
--
GitLab