Cleanup in CMakeLists.txt (#1572)

CMakeLists.txt

@@ -43,6 +43,36 @@ function( vulkan_hpp__setup_platform )
 	endif()
 endfunction()
 
+function( vulkan_hpp__setup_vulkan_include )
+	set( options )
+	set( oneValueArgs NAME )
+	set( multiValueArgs )
+	cmake_parse_arguments( TARGET "{options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+	
+	if( VULKAN_HPP_SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP )
+		target_include_directories( ${TARGET_NAME} PUBLIC "${CMAKE_SOURCE_DIR}" )
+		target_include_directories( ${TARGET_NAME} PUBLIC "${CMAKE_SOURCE_DIR}/Vulkan-Headers/include" )
+	else()
+		target_include_directories( ${TARGET_NAME} PUBLIC "${Vulkan_INCLUDE_DIRS}" )
+	endif()
+endfunction()
+
+function( vulkan_hpp__setup_warning_level )
+	set( options )
+	set( oneValueArgs NAME )
+	set( multiValueArgs )
+	cmake_parse_arguments( TARGET "{options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+	
+	if( MSVC )
+		target_compile_options(${TARGET_NAME} PRIVATE /W4 /WX )
+		if( MSVC_VER GREATER_EQUAL 1910 )
+			target_compile_options( ${TARGET_NAME} PRIVATE /permissive- )
+		endif()
+	else()
+		target_compile_options( ${TARGET_NAME} PRIVATE -Wall -Wextra -pedantic -Werror )
+	endif()
+endfunction()
+
 function( vulkan_hpp__setup_project )
 	set( options )
 	set( oneValueArgs NAME )
@@ -54,7 +84,7 @@ endfunction()
 
 function( vulkan_hpp__setup_library )
 	set( options SHARED )
-	set( oneValueArgs NAME )
+	set( oneValueArgs FOLDER NAME )
 	set( multiValueArgs HEADERS SOURCES )
 	cmake_parse_arguments( TARGET "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 	
@@ -69,9 +99,12 @@ function( vulkan_hpp__setup_library )
 			add_library( ${TARGET_NAME} ${TARGET_SOURCES} ${TARGET_HEADERS} )
 		endif()
 		vulkan_hpp__setup_platform( NAME ${TARGET_NAME} )
-		set_target_properties( ${TARGET_NAME} PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON )
-		target_include_directories( ${TARGET_NAME} PUBLIC ${VulkanHeaders_INCLUDE_DIR} )	
+		vulkan_hpp__setup_vulkan_include( NAME ${TARGET_NAME} )
+		vulkan_hpp__setup_warning_level( NAME ${TARGET_NAME} )
+		set_target_properties( ${TARGET_NAME} PROPERTIES CXX_STANDARD 11 )
+		set_target_properties( ${TARGET_NAME} PROPERTIES CXX_STANDARD_REQUIRED ON )
 	endif()
+	set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${TARGET_FOLDER} )
 endfunction()
 
 function( vulkan_hpp__setup_sample )
@@ -80,11 +113,17 @@ function( vulkan_hpp__setup_sample )
 	set( multiValueArgs HEADERS INCLUDE_DIRS LIBS PCH SOURCES )
 	cmake_parse_arguments( TARGET "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
+	if( NOT (VULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC AND VULKAN_HPP_SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP) )
+		find_package( Vulkan REQUIRED )
+	endif()
+
 	vulkan_hpp__setup_project( NAME ${TARGET_NAME} )
 
 	add_executable( ${TARGET_NAME} ${TARGET_HEADERS} ${TARGET_SOURCES} )
 	
 	vulkan_hpp__setup_platform( NAME ${TARGET_NAME} )
+	vulkan_hpp__setup_vulkan_include( NAME ${TARGET_NAME} )
+	vulkan_hpp__setup_warning_level( NAME ${TARGET_NAME} )
 
 	set_target_properties( ${TARGET_NAME} PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON )
 
@@ -92,7 +131,6 @@ function( vulkan_hpp__setup_sample )
 		set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER "${TARGET_FOLDER}" )
 	endif()
 	
-	target_include_directories( ${TARGET_NAME} PUBLIC ${VulkanHeaders_INCLUDE_DIR} )
 	if( TARGET_INCLUDE_DIRS )
 		target_include_directories( ${TARGET_NAME} PUBLIC ${TARGET_INCLUDE_DIRS} )
 	endif()
@@ -116,7 +154,7 @@ function( vulkan_hpp__setup_sample_static )
 	set( multiValueArgs )
 	cmake_parse_arguments( TARGET "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
-	if( NOT SAMPLES_BUILD_ONLY_DYNAMIC )
+	if( NOT VULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC )
 		if( NOT TARGET_NAME )
 			message( FATAL_ERROR "NAME must be defined in vulkan_hpp__setup_sample_static" )
 		endif()
@@ -183,9 +221,13 @@ endfunction()
 function( vulkan_hpp__setup_test )
 	set( options )
 	set( oneValueArgs CXX_STANDARD NAME )
-	set( multiValueArgs )
+	set( multiValueArgs LIBRARIES )
 	cmake_parse_arguments( TARGET "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
+	if( NOT (VULKAN_HPP_TESTS_BUILD_ONLY_DYNAMIC AND VULKAN_HPP_TESTS_BUILD_WITH_LOCAL_VULKAN_HPP) )
+		find_package( Vulkan REQUIRED )
+	endif()
+
 	if( NOT TARGET_NAME )
 		message( FATAL_ERROR "NAME must be defined in vulkan_hpp__setup_test" )
 	endif()
@@ -198,9 +240,13 @@ function( vulkan_hpp__setup_test )
 	add_executable( ${TARGET_NAME} ${TARGET_NAME}.cpp )
 	
 	vulkan_hpp__setup_platform( NAME ${TARGET_NAME} )
+	vulkan_hpp__setup_vulkan_include( NAME ${TARGET_NAME} )
+	vulkan_hpp__setup_warning_level( NAME ${TARGET_NAME} )
 
-	set_target_properties( ${TARGET_NAME} PROPERTIES CXX_STANDARD ${TARGET_CXX_STANDARD} CXX_STANDARD_REQUIRED ON )
+	set_target_properties( ${TARGET_NAME} PROPERTIES CXX_STANDARD ${TARGET_CXX_STANDARD} CXX_STANDARD_REQUIRED ON FOLDER "Tests" )
 	target_include_directories( ${TARGET_NAME} PUBLIC ${VulkanHeaders_INCLUDE_DIR} )
+	target_include_directories( ${TARGET_NAME} PUBLIC "${CMAKE_SOURCE_DIR}/glm" )
+	target_link_libraries( ${TARGET_NAME} PRIVATE utils ${TARGET_LIBRARIES} )
 endfunction()
 
 set_property( GLOBAL PROPERTY USE_FOLDERS ON )
@@ -248,6 +294,10 @@ option( VULKAN_HPP_PRECOMPILE "Precompile vulkan.hpp and vulkan_raii.hpp for sam
 option( VULKAN_HPP_RUN_GENERATOR "Run the HPP generator" OFF )
 option( VULKAN_HPP_SAMPLES_BUILD "Build samples" OFF )
 option( VULKAN_HPP_TESTS_BUILD "Build tests" OFF )
+option( VULKAN_HPP_SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP "Build with local Vulkan headers" ON )
+option( VULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC "Build only dynamic. Required in case the Vulkan SDK is not available" OFF )
+option( VULKAN_HPP_TESTS_BUILD_WITH_LOCAL_VULKAN_HPP "Build with local Vulkan headers" ON )
+option( VULKAN_HPP_TESTS_BUILD_ONLY_DYNAMIC "Build only dynamic" OFF )
 
 # look for the file vk.xml, the ultimate source of truth for vulkan, to generate the headers from
 if( NOT DEFINED VulkanRegistry_DIR )
@@ -274,16 +324,9 @@ project( VulkanHppGenerator LANGUAGES CXX )
 
 add_executable( ${PROJECT_NAME} VulkanHppGenerator.cpp VulkanHppGenerator.hpp ${TINYXML2_SOURCES} ${TINYXML2_HEADERS} )
 
-target_compile_definitions( ${PROJECT_NAME} PUBLIC BASE_PATH="${CMAKE_SOURCE_DIR}" VK_SPEC="${vk_spec}" )
+vulkan_hpp__setup_warning_level( NAME ${PROJECT_NAME} )
 
-if( MSVC )
-	target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX )
-	if( MSVC_VER GREATER_EQUAL 1910 )
-		target_compile_options( ${PROJECT_NAME} PRIVATE /permissive- )
-	endif()
-else()
-	target_compile_options( ${PROJECT_NAME} PRIVATE -Wall -Wextra -pedantic -Werror )
-endif()
+target_compile_definitions( ${PROJECT_NAME} PUBLIC BASE_PATH="${CMAKE_SOURCE_DIR}" VK_SPEC="${vk_spec}" )
 
 target_include_directories( ${PROJECT_NAME} PRIVATE ${VULKAN_HPP_TINYXML2_SRC_DIR} )
 

RAII_Samples/01_InitInstance/CMakeLists.txt

@@ -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_raii( NAME 01_InitInstance )

RAII_Samples/02_EnumerateDevices/CMakeLists.txt

@@ -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_raii( NAME 02_EnumerateDevices )

RAII_Samples/03_InitDevice/CMakeLists.txt

@@ -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_raii( NAME 03_InitDevice )

RAII_Samples/04_InitCommandBuffer/CMakeLists.txt

@@ -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_raii( NAME 04_InitCommandBuffer )

RAII_Samples/05_InitSwapchain/CMakeLists.txt

@@ -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_raii( NAME 05_InitSwapchain )

RAII_Samples/06_InitDepthBuffer/CMakeLists.txt

@@ -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_raii( NAME 06_InitDepthBuffer )

RAII_Samples/07_InitUniformBuffer/CMakeLists.txt

@@ -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_raii( NAME 07_InitUniformBuffer )

RAII_Samples/08_InitPipelineLayout/CMakeLists.txt

@@ -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_raii( NAME 08_InitPipelineLayout )

RAII_Samples/09_InitDescriptorSet/CMakeLists.txt

@@ -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_raii( NAME 09_InitDescriptorSet )

RAII_Samples/10_InitRenderPass/CMakeLists.txt

@@ -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_raii( NAME 10_InitRenderPass )

RAII_Samples/11_InitShaders/CMakeLists.txt

@@ -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_raii( NAME 11_InitShaders )

RAII_Samples/12_InitFrameBuffers/CMakeLists.txt

@@ -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_raii( NAME 12_InitFrameBuffers )

RAII_Samples/13_InitVertexBuffer/CMakeLists.txt

@@ -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_raii( NAME 13_InitVertexBuffer )

RAII_Samples/14_InitPipeline/CMakeLists.txt

@@ -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_raii( NAME 14_InitPipeline )

RAII_Samples/15_DrawCube/CMakeLists.txt

@@ -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_raii( NAME 15_DrawCube )

RAII_Samples/16_Vulkan_1_1/CMakeLists.txt

@@ -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_raii( NAME 16_Vulkan_1_1 )

RAII_Samples/CMakeLists.txt

@@ -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 )

RAII_Samples/CopyBlitImage/CMakeLists.txt

@@ -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_raii( NAME CopyBlitImage )

RAII_Samples/CreateDebugUtilsMessenger/CMakeLists.txt

@@ -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_raii( NAME CreateDebugUtilsMessenger )

RAII_Samples/DebugUtilsObjectName/CMakeLists.txt

@@ -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_raii( NAME DebugUtilsObjectName )

RAII_Samples/DrawTexturedCube/CMakeLists.txt

@@ -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_raii( NAME DrawTexturedCube )

RAII_Samples/DynamicUniform/CMakeLists.txt

@@ -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_raii( NAME DynamicUniform )

RAII_Samples/EnableValidationWithCallback/CMakeLists.txt

@@ -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_raii( NAME EnableValidationWithCallback )

RAII_Samples/EnumerateDevicesAdvanced/CMakeLists.txt

@@ -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_raii( NAME EnumerateDevicesAdvanced )

RAII_Samples/Events/CMakeLists.txt

@@ -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_raii( NAME Events )

RAII_Samples/ImmutableSampler/CMakeLists.txt

@@ -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_raii( NAME ImmutableSampler )

RAII_Samples/InitTexture/CMakeLists.txt

@@ -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_raii( NAME InitTexture )

RAII_Samples/InputAttachment/CMakeLists.txt

@@ -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_raii( NAME InputAttachment )

RAII_Samples/InstanceExtensionProperties/CMakeLists.txt

@@ -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_raii( NAME InstanceExtensionProperties )

RAII_Samples/InstanceLayerExtensionProperties/CMakeLists.txt

@@ -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_raii( NAME InstanceLayerExtensionProperties )

RAII_Samples/InstanceLayerProperties/CMakeLists.txt

@@ -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_raii( NAME InstanceLayerProperties )

RAII_Samples/InstanceVersion/CMakeLists.txt

@@ -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_raii( NAME InstanceVersion )

RAII_Samples/MultipleSets/CMakeLists.txt

@@ -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_raii( NAME MultipleSets )

RAII_Samples/OcclusionQuery/CMakeLists.txt

@@ -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_raii( NAME OcclusionQuery )

RAII_Samples/PhysicalDeviceExtensions/CMakeLists.txt

@@ -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_raii( NAME PhysicalDeviceExtensions )

RAII_Samples/PhysicalDeviceFeatures/CMakeLists.txt

@@ -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_raii( NAME PhysicalDeviceFeatures )

RAII_Samples/PhysicalDeviceGroups/CMakeLists.txt

@@ -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_raii( NAME PhysicalDeviceGroups )

RAII_Samples/PhysicalDeviceMemoryProperties/CMakeLists.txt

@@ -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_raii( NAME PhysicalDeviceMemoryProperties )

RAII_Samples/PhysicalDeviceProperties/CMakeLists.txt

@@ -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_raii( NAME PhysicalDeviceProperties )

RAII_Samples/PhysicalDeviceQueueFamilyProperties/CMakeLists.txt

@@ -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_raii( NAME PhysicalDeviceQueueFamilyProperties )

RAII_Samples/PipelineCache/CMakeLists.txt

@@ -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_raii( NAME PipelineCache )

RAII_Samples/PipelineDerivative/CMakeLists.txt

@@ -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_raii( NAME PipelineDerivative )

RAII_Samples/PushConstants/CMakeLists.txt

@@ -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_raii( NAME PushConstants )

RAII_Samples/PushDescriptors/CMakeLists.txt

@@ -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_raii( NAME PushDescriptors )

RAII_Samples/RayTracing/CMakeLists.txt

@@ -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_raii(
     NAME RayTracing
     INCLUDE_DIRS

RAII_Samples/SecondaryCommandBuffer/CMakeLists.txt

@@ -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_raii( NAME SecondaryCommandBuffer )

RAII_Samples/SeparateImageSampler/CMakeLists.txt

@@ -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_raii( NAME SeparateImageSampler )

RAII_Samples/SurfaceCapabilities/CMakeLists.txt

@@ -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_raii( NAME SurfaceCapabilities )
-
 endif()

RAII_Samples/SurfaceFormats/CMakeLists.txt

@@ -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_raii( NAME SurfaceFormats )

RAII_Samples/Template/CMakeLists.txt

@@ -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_raii( NAME Template )

RAII_Samples/TexelBuffer/CMakeLists.txt

@@ -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_raii( NAME TexelBuffer )

RAII_Samples/utils/CMakeLists.txt

@@ -12,9 +12,10 @@
 # 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 RAII_utils HEADERS shaders.hpp utils.hpp )
+vulkan_hpp__setup_library(
+	NAME RAII_utils
+	HEADERS shaders.hpp utils.hpp
+	FOLDER "RAII_Samples" )
 
 target_link_libraries( RAII_utils INTERFACE utils )
 target_compile_definitions( RAII_utils INTERFACE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1 )

samples/01_InitInstance/CMakeLists.txt

@@ -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 )

samples/02_EnumerateDevices/CMakeLists.txt

@@ -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 )

samples/03_InitDevice/CMakeLists.txt

@@ -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 )

samples/04_InitCommandBuffer/CMakeLists.txt

@@ -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 )

samples/05_InitSwapchain/CMakeLists.txt

@@ -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 )

samples/06_InitDepthBuffer/CMakeLists.txt

@@ -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 )

samples/07_InitUniformBuffer/CMakeLists.txt

@@ -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 )

samples/08_InitPipelineLayout/CMakeLists.txt

@@ -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 )

samples/09_InitDescriptorSet/CMakeLists.txt

@@ -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 )

samples/10_InitRenderPass/CMakeLists.txt

@@ -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 )

samples/11_InitShaders/CMakeLists.txt

@@ -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 )

samples/12_InitFrameBuffers/CMakeLists.txt

@@ -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 )

samples/13_InitVertexBuffer/CMakeLists.txt

@@ -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 )

samples/14_InitPipeline/CMakeLists.txt

@@ -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 )

samples/15_DrawCube/CMakeLists.txt

@@ -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 )

samples/16_Vulkan_1_1/CMakeLists.txt

@@ -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 )

samples/CMakeLists.txt

@@ -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 )

samples/CopyBlitImage/CMakeLists.txt

@@ -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 )

samples/CreateDebugUtilsMessenger/CMakeLists.txt

@@ -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 )

samples/DebugUtilsObjectName/CMakeLists.txt

@@ -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 )

samples/DrawTexturedCube/CMakeLists.txt

@@ -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 )

samples/DynamicUniform/CMakeLists.txt

@@ -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 )

samples/EnableValidationWithCallback/CMakeLists.txt

@@ -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 )

samples/EnumerateDevicesAdvanced/CMakeLists.txt

@@ -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 )

samples/Events/CMakeLists.txt

@@ -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 )

samples/ImmutableSampler/CMakeLists.txt

@@ -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 )

samples/InitTexture/CMakeLists.txt

@@ -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 )

samples/InputAttachment/CMakeLists.txt

@@ -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 )

samples/InstanceExtensionProperties/CMakeLists.txt

@@ -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 )

samples/InstanceLayerExtensionProperties/CMakeLists.txt

@@ -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 )

samples/InstanceLayerProperties/CMakeLists.txt

@@ -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 )

samples/InstanceVersion/CMakeLists.txt

@@ -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 )

samples/MultipleSets/CMakeLists.txt

@@ -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 )

samples/OcclusionQuery/CMakeLists.txt

@@ -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 )

samples/PhysicalDeviceExtensions/CMakeLists.txt

@@ -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 )

samples/PhysicalDeviceFeatures/CMakeLists.txt

@@ -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 )

samples/PhysicalDeviceGroups/CMakeLists.txt

@@ -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 )

samples/PhysicalDeviceMemoryProperties/CMakeLists.txt

@@ -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 )

samples/PhysicalDeviceProperties/CMakeLists.txt

@@ -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 )

samples/PhysicalDeviceQueueFamilyProperties/CMakeLists.txt

@@ -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 )

samples/PipelineCache/CMakeLists.txt

@@ -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 )

samples/PipelineDerivative/CMakeLists.txt

@@ -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 )

samples/PushConstants/CMakeLists.txt

@@ -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 )

samples/PushDescriptors/CMakeLists.txt

@@ -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 )

samples/RayTracing/CMakeLists.txt

@@ -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

samples/SecondaryCommandBuffer/CMakeLists.txt

@@ -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 )

samples/SeparateImageSampler/CMakeLists.txt

@@ -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 )