From 897e8bea0b2a5d2e91bc756583f71d34be1e6238 Mon Sep 17 00:00:00 2001 From: Peter Harris Date: Sun, 12 Jan 2025 21:37:38 +0000 Subject: [PATCH] Fix unit test include path --- generator/vk_codegen/source_CMakeLists.txt | 12 ++++++------ layer_example/source/CMakeLists.txt | 12 ++++++------ layer_gpu_support/source/CMakeLists.txt | 12 ++++++------ layer_gpu_timeline/source/CMakeLists.txt | 14 +++++++------- source_common/comms/test/CMakeLists.txt | 2 ++ source_common/framework/CMakeLists.txt | 13 ++++++------- source_common/trackers/CMakeLists.txt | 6 +++--- 7 files changed, 36 insertions(+), 35 deletions(-) diff --git a/generator/vk_codegen/source_CMakeLists.txt b/generator/vk_codegen/source_CMakeLists.txt index 99a1948..dcb3f42 100644 --- a/generator/vk_codegen/source_CMakeLists.txt +++ b/generator/vk_codegen/source_CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT # ----------------------------------------------------------------------------- -# Copyright (c) 2024 Arm Limited +# Copyright (c) 2024-2025 Arm Limited # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to @@ -41,19 +41,19 @@ configure_file( add_library( ${VK_LAYER} SHARED - ${PROJECT_SOURCE_DIR}/../source_common/framework/entry.cpp + ../../source_common/framework/entry.cpp device.cpp instance.cpp) target_include_directories( ${VK_LAYER} PRIVATE - ${PROJECT_SOURCE_DIR}/../source_common - ${CMAKE_CURRENT_BINARY_DIR} - .) + ./ + ../../source_common/ + ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories( ${VK_LAYER} SYSTEM PRIVATE - ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include) + ../../source_third_party/khronos/vulkan/include/) lgl_set_build_options(${VK_LAYER}) diff --git a/layer_example/source/CMakeLists.txt b/layer_example/source/CMakeLists.txt index b1c2d38..8456f98 100644 --- a/layer_example/source/CMakeLists.txt +++ b/layer_example/source/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT # ----------------------------------------------------------------------------- -# Copyright (c) 2024 Arm Limited +# Copyright (c) 2024-2025 Arm Limited # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to @@ -41,20 +41,20 @@ configure_file( add_library( ${VK_LAYER} SHARED - ${PROJECT_SOURCE_DIR}/../source_common/framework/entry.cpp + ../../source_common/framework/entry.cpp device.cpp instance.cpp layer_device_functions.cpp) target_include_directories( ${VK_LAYER} PRIVATE - ${PROJECT_SOURCE_DIR}/../source_common - ${CMAKE_CURRENT_BINARY_DIR} - .) + ./ + ../../source_common/ + ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories( ${VK_LAYER} SYSTEM PRIVATE - ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include) + ../../source_third_party/khronos/vulkan/include/) lgl_set_build_options(${VK_LAYER}) diff --git a/layer_gpu_support/source/CMakeLists.txt b/layer_gpu_support/source/CMakeLists.txt index 8c51fad..72f6662 100644 --- a/layer_gpu_support/source/CMakeLists.txt +++ b/layer_gpu_support/source/CMakeLists.txt @@ -41,7 +41,7 @@ configure_file( add_library( ${VK_LAYER} SHARED - ${PROJECT_SOURCE_DIR}/../source_common/framework/entry.cpp + ../../source_common/framework/entry.cpp device.cpp instance.cpp layer_config.cpp @@ -53,14 +53,14 @@ add_library( target_include_directories( ${VK_LAYER} PRIVATE - ${PROJECT_SOURCE_DIR}/../source_common - ${CMAKE_CURRENT_BINARY_DIR} - .) + ./ + ../../source_common/ + ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories( ${VK_LAYER} SYSTEM PRIVATE - ${PROJECT_SOURCE_DIR}/../source_third_party - ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include) + ../../source_third_party/ + ../../source_third_party/khronos/vulkan/include/) lgl_set_build_options(${VK_LAYER}) diff --git a/layer_gpu_timeline/source/CMakeLists.txt b/layer_gpu_timeline/source/CMakeLists.txt index 68b34d7..2b52fe8 100644 --- a/layer_gpu_timeline/source/CMakeLists.txt +++ b/layer_gpu_timeline/source/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT # ----------------------------------------------------------------------------- -# Copyright (c) 2024 Arm Limited +# Copyright (c) 2024-2025 Arm Limited # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to @@ -41,7 +41,7 @@ configure_file( add_library( ${VK_LAYER} SHARED - ${PROJECT_SOURCE_DIR}/../source_common/framework/entry.cpp + ../../source_common/framework/entry.cpp device.cpp instance.cpp layer_device_functions_command_buffer.cpp @@ -57,14 +57,14 @@ add_library( target_include_directories( ${VK_LAYER} PRIVATE - ${PROJECT_SOURCE_DIR}/../source_common - ${CMAKE_CURRENT_BINARY_DIR} - .) + ./ + ../../source_common/ + ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories( ${VK_LAYER} SYSTEM PRIVATE - ${PROJECT_SOURCE_DIR}/../source_third_party - ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include) + ../../source_third_party/ + ../../source_third_party/khronos/vulkan/include/) lgl_set_build_options(${VK_LAYER}) diff --git a/source_common/comms/test/CMakeLists.txt b/source_common/comms/test/CMakeLists.txt index 17ae4cc..d15218c 100644 --- a/source_common/comms/test/CMakeLists.txt +++ b/source_common/comms/test/CMakeLists.txt @@ -32,6 +32,8 @@ add_executable( target_include_directories( ${TEST_BINARY} PRIVATE ../../ + ../../../source_third_party/ + ../../../source_third_party/khronos/vulkan/include ${gtest_SOURCE_DIR}/include) target_link_libraries( diff --git a/source_common/framework/CMakeLists.txt b/source_common/framework/CMakeLists.txt index b0333a1..0ca2f06 100644 --- a/source_common/framework/CMakeLists.txt +++ b/source_common/framework/CMakeLists.txt @@ -31,16 +31,15 @@ add_library( target_include_directories( ${LIB_BINARY} PRIVATE - # Include from the layer-specific tree + ../ + # Include from the layer-specific trees ${PROJECT_SOURCE_DIR}/source - # Needed for CMake generated version.hpp - ${PROJECT_BINARY_DIR}/source - ../) + ${PROJECT_BINARY_DIR}/source) target_include_directories( ${LIB_BINARY} SYSTEM PRIVATE - ${PROJECT_SOURCE_DIR}/../source_third_party - ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include - ../) + ../ + ../../source_third_party/ + ../../source_third_party/khronos/vulkan/include/) lgl_set_build_options(${LIB_BINARY}) diff --git a/source_common/trackers/CMakeLists.txt b/source_common/trackers/CMakeLists.txt index 6667efe..9d1259d 100644 --- a/source_common/trackers/CMakeLists.txt +++ b/source_common/trackers/CMakeLists.txt @@ -33,9 +33,9 @@ add_library( target_include_directories( ${LIB_BINARY} PRIVATE - ${PROJECT_SOURCE_DIR}/../source_third_party/ - ${PROJECT_SOURCE_DIR}/../source_third_party/khronos/vulkan/include - ../) + ../ + ../../source_third_party/ + ../../source_third_party/khronos/vulkan/include) lgl_set_build_options(${LIB_BINARY})