From a20b4d4438c1b2ed3a257a404c08c2b2be7222e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Tue, 1 Jul 2025 15:59:53 +0200 Subject: [PATCH] Removed unused option INCLUDE_DIRS from makefiles. (#2204) --- CMakeLists.txt | 12 +++--------- RAII_Samples/RayTracing/CMakeLists.txt | 5 ----- samples/RayTracing/CMakeLists.txt | 5 ----- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 521e781..43f7990 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -422,7 +422,7 @@ endfunction() function( vulkan_hpp__setup_sample ) set( options ) set( oneValueArgs FOLDER NAME PCH_REUSE ) - set( multiValueArgs HEADERS INCLUDE_DIRS LIBS PCH SOURCES ) + set( multiValueArgs HEADERS LIBS PCH SOURCES ) cmake_parse_arguments( TARGET "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) if( NOT (VULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC AND VULKAN_HPP_BUILD_WITH_LOCAL_VULKAN_HPP) ) @@ -443,10 +443,6 @@ function( vulkan_hpp__setup_sample ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER "${TARGET_FOLDER}" ) endif() - if( TARGET_INCLUDE_DIRS ) - target_include_directories( ${TARGET_NAME} PUBLIC ${TARGET_INCLUDE_DIRS} ) - endif() - if( TARGET_LIBS ) target_link_libraries( ${TARGET_NAME} PRIVATE "${TARGET_LIBS}" ) endif() @@ -487,7 +483,7 @@ endfunction() function( vulkan_hpp__setup_sample_dynamic ) set( options ) set( oneValueArgs NAME ) - set( multiValueArgs HEADERS INCLUDE_DIRS SOURCES ) + set( multiValueArgs HEADERS SOURCES ) cmake_parse_arguments( TARGET "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) if( NOT TARGET_NAME ) @@ -501,7 +497,6 @@ function( vulkan_hpp__setup_sample_dynamic ) NAME ${TARGET_NAME} FOLDER Samples PCH_REUSE utils - INCLUDE_DIRS ${TARGET_INCLUDE_DIRS} HEADERS ${TARGET_HEADERS} SOURCES ${TARGET_SOURCES} LIBS utils ) @@ -510,7 +505,7 @@ endfunction() function( vulkan_hpp__setup_sample_raii ) set( options ) set( oneValueArgs NAME ) - set( multiValueArgs HEADERS INCLUDE_DIRS SOURCES ) + set( multiValueArgs HEADERS SOURCES ) cmake_parse_arguments( TARGET "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) if( NOT TARGET_NAME ) @@ -524,7 +519,6 @@ function( vulkan_hpp__setup_sample_raii ) NAME RAII_${TARGET_NAME} FOLDER RAII_Samples PCH_REUSE utils - INCLUDE_DIRS ${TARGET_INCLUDE_DIRS} HEADERS ${TARGET_HEADERS} SOURCES ${TARGET_SOURCES} LIBS utils ) diff --git a/RAII_Samples/RayTracing/CMakeLists.txt b/RAII_Samples/RayTracing/CMakeLists.txt index 82225a4..5b9c912 100644 --- a/RAII_Samples/RayTracing/CMakeLists.txt +++ b/RAII_Samples/RayTracing/CMakeLists.txt @@ -14,11 +14,6 @@ vulkan_hpp__setup_sample_raii( NAME RayTracing - INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/samples/RayTracing/common - ${CMAKE_SOURCE_DIR}/samples/RayTracing/vulkannv - ${CMAKE_SOURCE_DIR}/stb - ${CMAKE_SOURCE_DIR}/tinyobjloader HEADERS CameraManipulator.hpp SOURCES diff --git a/samples/RayTracing/CMakeLists.txt b/samples/RayTracing/CMakeLists.txt index f92282f..16ca769 100644 --- a/samples/RayTracing/CMakeLists.txt +++ b/samples/RayTracing/CMakeLists.txt @@ -14,11 +14,6 @@ vulkan_hpp__setup_sample_dynamic( NAME RayTracing - INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/samples/RayTracing/common - ${CMAKE_SOURCE_DIR}/samples/RayTracing/vulkannv - ${CMAKE_SOURCE_DIR}/stb - ${CMAKE_SOURCE_DIR}/tinyobjloader HEADERS CameraManipulator.hpp SOURCES