From c7af7fdccdc9dc6634f9170c60f80dfb898066a4 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Wed, 13 May 2026 21:59:26 -0700 Subject: [PATCH] fix the include directories for the plugin_test --- CMakeLists.txt | 1 - test/plugin_test/CMakeLists.txt | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 738e5f5d..1d1d1f0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -235,7 +235,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME OR OPENCL_ICD_LOADER_BUILD_TESTING) endif() if((CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME OR OPENCL_ICD_LOADER_BUILD_TESTING) AND BUILD_TESTING) add_subdirectory (test) - endif () diff --git a/test/plugin_test/CMakeLists.txt b/test/plugin_test/CMakeLists.txt index c1b70e27..9c268e38 100644 --- a/test/plugin_test/CMakeLists.txt +++ b/test/plugin_test/CMakeLists.txt @@ -15,6 +15,11 @@ add_library (CLPlugin MODULE ${CL_PLUGIN_SOURCES}) target_compile_definitions(CLPlugin PRIVATE CL_TARGET_OPENCL_VERSION=310) target_link_libraries (CLPlugin OpenCL OpenCL::Headers) +# Reconfigure the ICD loader CMake config file, since it is included by +# some ICD loader files that this plugin uses. +configure_file(../../loader/icd_cmake_config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/icd_cmake_config.h) + set (CL_PLUGIN_LOADER_TEST_SOURCES cl_plugin_loader_test.c cl_plugin.h @@ -49,5 +54,5 @@ target_link_libraries (cl_plugin_loader_test PUBLIC ${CMAKE_DL_LIBS}) target_include_directories (cl_plugin_loader_test PRIVATE - ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ../../loader)