Cleanup in CMakeLists.txt (#1572)
This commit is contained in:
committed by
GitHub
parent
d4d0ac4859
commit
40e76b7c24
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
Reference in New Issue
Block a user