Cleanup up on CMakeLists.txt (#1564)
This commit is contained in:
Andreas Süßenbach
committed by
GitHub
GitHub
parent
20cb37e39f
commit
e1d6ec8abf
@@ -12,86 +12,76 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
cmake_minimum_required(VERSION 3.2)
|
||||
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)
|
||||
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)
|
||||
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(MSVC)
|
||||
add_compile_options(-Wall -Wextra -pedantic -Werror)
|
||||
endif(MSVC)
|
||||
|
||||
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
|
||||
add_definitions(-DNOMINMAX -DVK_USE_PLATFORM_WIN32_KHR)
|
||||
elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
|
||||
elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||
add_definitions(-DVK_USE_PLATFORM_MACOS_MVK)
|
||||
if( MSVC )
|
||||
add_compile_options( /W4 /WX /permissive- )
|
||||
else()
|
||||
message(FATAL_ERROR, "Vulkan-Hpp: unhandled platform for samples!")
|
||||
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")
|
||||
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}")
|
||||
include_directories( "${Vulkan_INCLUDE_DIRS}" )
|
||||
endif()
|
||||
|
||||
add_subdirectory(utils)
|
||||
add_subdirectory(01_InitInstance)
|
||||
add_subdirectory(02_EnumerateDevices)
|
||||
add_subdirectory(03_InitDevice)
|
||||
add_subdirectory(04_InitCommandBuffer)
|
||||
add_subdirectory(05_InitSwapchain)
|
||||
add_subdirectory(06_InitDepthBuffer)
|
||||
add_subdirectory(07_InitUniformBuffer)
|
||||
add_subdirectory(08_InitPipelineLayout)
|
||||
add_subdirectory(09_InitDescriptorSet)
|
||||
add_subdirectory(10_InitRenderPass)
|
||||
add_subdirectory(11_InitShaders)
|
||||
add_subdirectory(12_InitFrameBuffers)
|
||||
add_subdirectory(13_InitVertexBuffer)
|
||||
add_subdirectory(14_InitPipeline)
|
||||
add_subdirectory(15_DrawCube)
|
||||
add_subdirectory(16_Vulkan_1_1)
|
||||
add_subdirectory(CopyBlitImage)
|
||||
add_subdirectory(CreateDebugUtilsMessenger)
|
||||
add_subdirectory(DebugUtilsObjectName)
|
||||
add_subdirectory(DrawTexturedCube)
|
||||
add_subdirectory(DynamicUniform)
|
||||
add_subdirectory(EnableValidationWithCallback)
|
||||
add_subdirectory(EnumerateDevicesAdvanced)
|
||||
add_subdirectory(Events)
|
||||
add_subdirectory(ImmutableSampler)
|
||||
add_subdirectory(InitTexture)
|
||||
add_subdirectory(InputAttachment)
|
||||
add_subdirectory(InstanceExtensionProperties)
|
||||
add_subdirectory(InstanceLayerExtensionProperties)
|
||||
add_subdirectory(InstanceLayerProperties)
|
||||
add_subdirectory(InstanceVersion)
|
||||
add_subdirectory(MultipleSets)
|
||||
add_subdirectory(OcclusionQuery)
|
||||
add_subdirectory(PhysicalDeviceExtensions)
|
||||
add_subdirectory(PhysicalDeviceFeatures)
|
||||
add_subdirectory(PhysicalDeviceGroups)
|
||||
add_subdirectory(PhysicalDeviceMemoryProperties)
|
||||
add_subdirectory(PhysicalDeviceProperties)
|
||||
add_subdirectory(PhysicalDeviceQueueFamilyProperties)
|
||||
add_subdirectory(PipelineCache)
|
||||
add_subdirectory(PipelineDerivative)
|
||||
add_subdirectory(PushConstants)
|
||||
add_subdirectory(PushDescriptors)
|
||||
add_subdirectory(RayTracing)
|
||||
add_subdirectory(SecondaryCommandBuffer)
|
||||
add_subdirectory(SeparateImageSampler)
|
||||
add_subdirectory(SurfaceCapabilities)
|
||||
add_subdirectory(SurfaceFormats)
|
||||
add_subdirectory(Template)
|
||||
add_subdirectory(TexelBuffer)
|
||||
add_subdirectory( utils )
|
||||
add_subdirectory( 01_InitInstance )
|
||||
add_subdirectory( 02_EnumerateDevices )
|
||||
add_subdirectory( 03_InitDevice )
|
||||
add_subdirectory( 04_InitCommandBuffer )
|
||||
add_subdirectory( 05_InitSwapchain )
|
||||
add_subdirectory( 06_InitDepthBuffer )
|
||||
add_subdirectory( 07_InitUniformBuffer )
|
||||
add_subdirectory( 08_InitPipelineLayout )
|
||||
add_subdirectory( 09_InitDescriptorSet )
|
||||
add_subdirectory( 10_InitRenderPass )
|
||||
add_subdirectory( 11_InitShaders )
|
||||
add_subdirectory( 12_InitFrameBuffers )
|
||||
add_subdirectory( 13_InitVertexBuffer )
|
||||
add_subdirectory( 14_InitPipeline )
|
||||
add_subdirectory( 15_DrawCube )
|
||||
add_subdirectory( 16_Vulkan_1_1 )
|
||||
add_subdirectory( CopyBlitImage )
|
||||
add_subdirectory( CreateDebugUtilsMessenger )
|
||||
add_subdirectory( DebugUtilsObjectName )
|
||||
add_subdirectory( DrawTexturedCube )
|
||||
add_subdirectory( DynamicUniform )
|
||||
add_subdirectory( EnableValidationWithCallback )
|
||||
add_subdirectory( EnumerateDevicesAdvanced )
|
||||
add_subdirectory( Events )
|
||||
add_subdirectory( ImmutableSampler )
|
||||
add_subdirectory( InitTexture )
|
||||
add_subdirectory( InputAttachment )
|
||||
add_subdirectory( InstanceExtensionProperties )
|
||||
add_subdirectory( InstanceLayerExtensionProperties )
|
||||
add_subdirectory( InstanceLayerProperties )
|
||||
add_subdirectory( InstanceVersion )
|
||||
add_subdirectory( MultipleSets )
|
||||
add_subdirectory( OcclusionQuery )
|
||||
add_subdirectory( PhysicalDeviceExtensions )
|
||||
add_subdirectory( PhysicalDeviceFeatures )
|
||||
add_subdirectory( PhysicalDeviceGroups )
|
||||
add_subdirectory( PhysicalDeviceMemoryProperties )
|
||||
add_subdirectory( PhysicalDeviceProperties )
|
||||
add_subdirectory( PhysicalDeviceQueueFamilyProperties )
|
||||
add_subdirectory( PipelineCache )
|
||||
add_subdirectory( PipelineDerivative )
|
||||
add_subdirectory( PushConstants )
|
||||
add_subdirectory( PushDescriptors )
|
||||
add_subdirectory( RayTracing )
|
||||
add_subdirectory( SecondaryCommandBuffer )
|
||||
add_subdirectory( SeparateImageSampler )
|
||||
add_subdirectory( SurfaceCapabilities )
|
||||
add_subdirectory( SurfaceFormats )
|
||||
add_subdirectory( Template )
|
||||
add_subdirectory( TexelBuffer )
|
||||
|
||||
@@ -12,26 +12,10 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
cmake_minimum_required(VERSION 3.2)
|
||||
cmake_minimum_required( VERSION 3.2 )
|
||||
|
||||
project(RAII_utils LANGUAGES CXX)
|
||||
vulkan_hpp__setup_library( NAME RAII_utils HEADERS shaders.hpp utils.hpp )
|
||||
|
||||
set(HEADERS
|
||||
shaders.hpp
|
||||
utils.hpp
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
)
|
||||
|
||||
source_group(headers FILES ${HEADERS})
|
||||
source_group(sources FILES ${SOURCES})
|
||||
|
||||
add_library(RAII_utils INTERFACE
|
||||
${SOURCES}
|
||||
${HEADERS}
|
||||
)
|
||||
|
||||
target_link_libraries(RAII_utils INTERFACE utils)
|
||||
target_compile_definitions(RAII_utils INTERFACE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1)
|
||||
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