Fix unit test include path

ARM-software · Jan 12, 2025 · 897e8be · 897e8be
1 parent 47cde17
commit 897e8be
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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})