mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup in CMakeLists.txt (#1572)

Browse Source
This commit is contained in:
Andreas Süßenbach
2023-05-08 11:54:57 +02:00
committed by GitHub
parent d4d0ac4859
commit 40e76b7c24
123 changed files with 100 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/01_InitInstance/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_static( NAME 01_InitInstance )

2
samples/02_EnumerateDevices/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 02_EnumerateDevices )

2
samples/03_InitDevice/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 03_InitDevice )

2
samples/04_InitCommandBuffer/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 04_InitCommandBuffer )

2
samples/05_InitSwapchain/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 05_InitSwapchain )

2
samples/06_InitDepthBuffer/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 06_InitDepthBuffer )

2
samples/07_InitUniformBuffer/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 07_InitUniformBuffer )

2
samples/08_InitPipelineLayout/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 08_InitPipelineLayout )

2
samples/09_InitDescriptorSet/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 09_InitDescriptorSet )

2
samples/10_InitRenderPass/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 10_InitRenderPass )

2
samples/11_InitShaders/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 11_InitShaders )

2
samples/12_InitFrameBuffers/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 12_InitFrameBuffers )

2
samples/13_InitVertexBuffer/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 13_InitVertexBuffer )

2
samples/14_InitPipeline/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 14_InitPipeline )

2
samples/15_DrawCube/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 15_DrawCube )

2
samples/16_Vulkan_1_1/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME 16_Vulkan_1_1 )

22
samples/CMakeLists.txt
View File

@@ -12,28 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required( VERSION 3.2 )
option( SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP "Build with local Vulkan headers" ON )
option( SAMPLES_BUILD_ONLY_DYNAMIC "Build only dynamic. Required in case the Vulkan SDK is not available" OFF )
if( NOT (SAMPLES_BUILD_ONLY_DYNAMIC AND SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP) )
find_package( Vulkan REQUIRED )
endif()
if( MSVC )
add_compile_options( /W4 /WX /permissive- )
else()
add_compile_options( -Wall -Wextra -pedantic -Werror )
endif()
if( SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP )
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/.." )
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include" )
else()
include_directories( "${Vulkan_INCLUDE_DIRS}" )
endif()
add_subdirectory( utils )
add_subdirectory( 01_InitInstance )
add_subdirectory( 02_EnumerateDevices )

2
samples/CopyBlitImage/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME CopyBlitImage )

2
samples/CreateDebugUtilsMessenger/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_static( NAME CreateDebugUtilsMessenger )

2
samples/DebugUtilsObjectName/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME DebugUtilsObjectName )

2
samples/DrawTexturedCube/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME DrawTexturedCube )

2
samples/DynamicUniform/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME DynamicUniform )

2
samples/EnableValidationWithCallback/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME EnableValidationWithCallback )

2
samples/EnumerateDevicesAdvanced/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME EnumerateDevicesAdvanced )

2
samples/Events/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME Events )

2
samples/ImmutableSampler/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME ImmutableSampler )

2
samples/InitTexture/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME InitTexture )

2
samples/InputAttachment/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME InputAttachment )

2
samples/InstanceExtensionProperties/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_static( NAME InstanceExtensionProperties )

2
samples/InstanceLayerExtensionProperties/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_static( NAME InstanceLayerExtensionProperties )

2
samples/InstanceLayerProperties/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_static( NAME InstanceLayerProperties )

2
samples/InstanceVersion/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_static( NAME InstanceVersion )

2
samples/MultipleSets/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME MultipleSets )

2
samples/OcclusionQuery/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME OcclusionQuery )

2
samples/PhysicalDeviceExtensions/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME PhysicalDeviceExtensions )

2
samples/PhysicalDeviceFeatures/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME PhysicalDeviceFeatures )

2
samples/PhysicalDeviceGroups/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME PhysicalDeviceGroups )

2
samples/PhysicalDeviceMemoryProperties/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME PhysicalDeviceMemoryProperties )

2
samples/PhysicalDeviceProperties/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME PhysicalDeviceProperties )

2
samples/PhysicalDeviceQueueFamilyProperties/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME PhysicalDeviceQueueFamilyProperties )

2
samples/PipelineCache/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME PipelineCache )

2
samples/PipelineDerivative/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME PipelineDerivative )

2
samples/PushConstants/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME PushConstants )

2
samples/PushDescriptors/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME PushDescriptors )

2
samples/RayTracing/CMakeLists.txt
View File

@@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic(
NAME RayTracing
INCLUDE_DIRS

2
samples/SecondaryCommandBuffer/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME SecondaryCommandBuffer )

2
samples/SeparateImageSampler/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME SeparateImageSampler )

4
samples/SurfaceCapabilities/CMakeLists.txt
View File

@@ -12,11 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
# Win32 exclusive vk::SurfaceCapabilitiesFullScreenExclusiveEXT is used
if(WIN32)
vulkan_hpp__setup_sample_dynamic( NAME SurfaceCapabilities )
endif()

2
samples/SurfaceFormats/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME SurfaceFormats )

2
samples/Template/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME Template )

2
samples/TexelBuffer/CMakeLists.txt
View File

@@ -12,6 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 3.2)
vulkan_hpp__setup_sample_dynamic( NAME TexelBuffer )

10
samples/utils/CMakeLists.txt
View File

@@ -12,9 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required( VERSION 3.2 )
vulkan_hpp__setup_library( NAME utils HEADERS math.hpp shaders.hpp utils.hpp SOURCES math.cpp shaders.cpp utils.cpp )
vulkan_hpp__setup_library(
NAME utils
HEADERS math.hpp shaders.hpp utils.hpp
SOURCES math.cpp shaders.cpp utils.cpp
FOLDER "Samples" )
if( VULKAN_HPP_RUN_GENERATOR )
add_dependencies( utils build_vulkan_hpp )
@@ -25,6 +27,6 @@ target_link_libraries( utils PUBLIC glfw )
target_link_libraries( utils PUBLIC glslang )
target_link_libraries( utils PUBLIC glslang-default-resource-limits )
target_link_libraries( utils PUBLIC SPIRV )
target_compile_definitions (utils PUBLIC VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1 )
target_compile_definitions( utils PUBLIC VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1 )
target_precompile_headers( utils PRIVATE <vulkan/vulkan.hpp> )