Cleanup up on CMakeLists.txt (#1564)

This commit is contained in:
Andreas Süßenbach
2023-04-20 16:50:26 +02:00
committed by GitHub
parent 20cb37e39f
commit e1d6ec8abf
23 changed files with 571 additions and 838 deletions

View File

@@ -12,26 +12,11 @@
# 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 )
if (NOT TESTS_BUILD_ONLY_DYNAMIC)
project(ArrayProxy LANGUAGES CXX)
if( NOT TESTS_BUILD_ONLY_DYNAMIC )
vulkan_hpp__setup_test( NAME ArrayProxy )
set(HEADERS
)
set(SOURCES
ArrayProxy.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(ArrayProxy
${HEADERS}
${SOURCES}
)
set_target_properties(ArrayProxy PROPERTIES FOLDER "Tests")
target_link_libraries(ArrayProxy PRIVATE utils)
set_target_properties( ArrayProxy PROPERTIES FOLDER "Tests" )
target_link_libraries( ArrayProxy PRIVATE utils )
endif()

View File

@@ -12,26 +12,11 @@
# 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 )
if (NOT TESTS_BUILD_ONLY_DYNAMIC)
project(ArrayProxyNoTemporaries LANGUAGES CXX)
if( NOT TESTS_BUILD_ONLY_DYNAMIC )
vulkan_hpp__setup_test( NAME ArrayProxyNoTemporaries )
set(HEADERS
)
set(SOURCES
ArrayProxyNoTemporaries.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(ArrayProxyNoTemporaries
${HEADERS}
${SOURCES}
)
set_target_properties(ArrayProxyNoTemporaries PROPERTIES FOLDER "Tests")
target_link_libraries(ArrayProxyNoTemporaries PRIVATE utils)
set_target_properties( ArrayProxyNoTemporaries PROPERTIES FOLDER "Tests" )
target_link_libraries( ArrayProxyNoTemporaries PRIVATE utils )
endif()

View File

@@ -12,52 +12,44 @@
# 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 (TESTS_BUILD_WITH_LOCAL_VULKAN_HPP "Build with local Vulkan headers" ON)
option (TESTS_BUILD_ONLY_DYNAMIC "Build only dynamic" OFF)
option( TESTS_BUILD_WITH_LOCAL_VULKAN_HPP "Build with local Vulkan headers" ON )
option( TESTS_BUILD_ONLY_DYNAMIC "Build only dynamic" OFF )
if (NOT (TESTS_BUILD_ONLY_DYNAMIC AND TESTS_BUILD_WITH_LOCAL_VULKAN_HPP))
find_package(Vulkan REQUIRED)
if( NOT (TESTS_BUILD_ONLY_DYNAMIC AND TESTS_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 (WIN32)
add_definitions(-DNOMINMAX -DVK_USE_PLATFORM_WIN32_KHR)
elseif(APPLE)
add_definitions(-DVK_USE_PLATFORM_MACOS_MVK)
elseif(UNIX)
add_definitions(-DVK_USE_PLATFORM_XLIB_KHR)
endif()
if (TESTS_BUILD_WITH_LOCAL_VULKAN_HPP)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include")
if( MSVC )
add_compile_options( /W4 /WX /permissive- )
else()
include_directories("${Vulkan_INCLUDE_DIRS}")
add_compile_options( -Wall -Wextra -pedantic -Werror )
endif()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../glm")
if( TESTS_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(ArrayProxy)
add_subdirectory(ArrayProxyNoTemporaries)
add_subdirectory(DesignatedInitializers)
add_subdirectory(DeviceFunctions)
add_subdirectory(DispatchLoaderDynamic)
add_subdirectory(DispatchLoaderDynamicSharedLibrary)
add_subdirectory(DispatchLoaderDynamicSharedLibraryClient)
add_subdirectory(DispatchLoaderStatic)
add_subdirectory(ExtensionInspection)
add_subdirectory(Flags)
add_subdirectory(FormatTraits)
add_subdirectory(Hash)
add_subdirectory(NoExceptions)
add_subdirectory(StridedArrayProxy)
add_subdirectory(StructureChain)
add_subdirectory(UniqueHandle)
add_subdirectory(UniqueHandleDefaultArguments)
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../glm" )
add_subdirectory( ArrayProxy )
add_subdirectory( ArrayProxyNoTemporaries )
add_subdirectory( DesignatedInitializers )
add_subdirectory( DeviceFunctions )
add_subdirectory( DispatchLoaderDynamic )
add_subdirectory( DispatchLoaderDynamicSharedLibrary )
add_subdirectory( DispatchLoaderDynamicSharedLibraryClient )
add_subdirectory( DispatchLoaderStatic )
add_subdirectory( ExtensionInspection )
add_subdirectory( Flags )
add_subdirectory( FormatTraits )
add_subdirectory( Hash )
add_subdirectory( NoExceptions )
add_subdirectory( StridedArrayProxy )
add_subdirectory( StructureChain )
add_subdirectory( UniqueHandle )
add_subdirectory( UniqueHandleDefaultArguments )

View File

@@ -12,28 +12,11 @@
# 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 )
if (NOT TESTS_BUILD_ONLY_DYNAMIC)
project(DesignatedInitializers LANGUAGES CXX)
if( NOT TESTS_BUILD_ONLY_DYNAMIC )
vulkan_hpp__setup_test( NAME DesignatedInitializers CXX_STANDARD 20 )
set(CMAKE_CXX_STANDARD 20)
set(HEADERS
)
set(SOURCES
DesignatedInitializers.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(DesignatedInitializers
${HEADERS}
${SOURCES}
)
set_target_properties(DesignatedInitializers PROPERTIES FOLDER "Tests")
target_link_libraries(DesignatedInitializers PRIVATE utils)
set_target_properties( DesignatedInitializers PROPERTIES FOLDER "Tests" )
target_link_libraries( DesignatedInitializers PRIVATE utils )
endif()

View File

@@ -12,29 +12,13 @@
# 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 )
if (NOT TESTS_BUILD_ONLY_DYNAMIC)
if( NOT TESTS_BUILD_ONLY_DYNAMIC )
vulkan_hpp__setup_test( NAME DeviceFunctions )
find_package(Vulkan REQUIRED)
find_package( Vulkan REQUIRED )
project(DeviceFunctions LANGUAGES CXX)
set(HEADERS
)
set(SOURCES
DeviceFunctions.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(DeviceFunctions
${HEADERS}
${SOURCES}
)
set_target_properties(DeviceFunctions PROPERTIES FOLDER "Tests")
target_link_libraries(DeviceFunctions PRIVATE utils ${Vulkan_LIBRARIES})
set_target_properties( DeviceFunctions PROPERTIES FOLDER "Tests" )
target_link_libraries( DeviceFunctions PRIVATE utils ${Vulkan_LIBRARIES} )
endif()

View File

@@ -12,28 +12,13 @@
# 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(DispatchLoaderDynamic LANGUAGES CXX)
vulkan_hpp__setup_test( NAME DispatchLoaderDynamic )
set(HEADERS
)
set(SOURCES
DispatchLoaderDynamic.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(DispatchLoaderDynamic
${HEADERS}
${SOURCES}
)
if (UNIX)
target_link_libraries(DispatchLoaderDynamic PRIVATE ${CMAKE_DL_LIBS})
if( UNIX )
target_link_libraries( DispatchLoaderDynamic PRIVATE ${CMAKE_DL_LIBS} )
endif()
set_target_properties(DispatchLoaderDynamic PROPERTIES FOLDER "Tests")
target_link_libraries(DispatchLoaderDynamic PRIVATE utils)
set_target_properties( DispatchLoaderDynamic PROPERTIES FOLDER "Tests" )
target_link_libraries( DispatchLoaderDynamic PRIVATE utils )

View File

@@ -12,30 +12,15 @@
# 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(DispatchLoaderDynamicSharedLibrary LANGUAGES CXX)
vulkan_hpp__setup_library( NAME DispatchLoaderDynamicSharedLibrary SHARED SOURCES DispatchLoaderDynamicSharedLibrary.cpp )
set(HEADERS
)
target_compile_definitions( DispatchLoaderDynamicSharedLibrary PRIVATE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1 VULKAN_HPP_STORAGE_SHARED VULKAN_HPP_STORAGE_SHARED_EXPORT )
set(SOURCES
DispatchLoaderDynamicSharedLibrary.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_library(DispatchLoaderDynamicSharedLibrary SHARED
${HEADERS}
${SOURCES}
)
target_compile_definitions(DispatchLoaderDynamicSharedLibrary PRIVATE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1 VULKAN_HPP_STORAGE_SHARED VULKAN_HPP_STORAGE_SHARED_EXPORT )
if (UNIX)
target_link_libraries(DispatchLoaderDynamicSharedLibrary PRIVATE ${CMAKE_DL_LIBS})
if( UNIX )
target_link_libraries( DispatchLoaderDynamicSharedLibrary PRIVATE ${CMAKE_DL_LIBS} )
endif()
set_target_properties(DispatchLoaderDynamicSharedLibrary PROPERTIES FOLDER "Tests")
target_link_libraries(DispatchLoaderDynamicSharedLibrary PRIVATE utils)
set_target_properties( DispatchLoaderDynamicSharedLibrary PROPERTIES FOLDER "Tests" )
target_link_libraries( DispatchLoaderDynamicSharedLibrary PRIVATE utils )

View File

@@ -12,32 +12,17 @@
# 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(DispatchLoaderDynamicSharedLibraryClient LANGUAGES CXX)
vulkan_hpp__setup_test( NAME DispatchLoaderDynamicSharedLibraryClient )
set(HEADERS
)
target_compile_definitions( DispatchLoaderDynamicSharedLibraryClient PRIVATE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1 VULKAN_HPP_STORAGE_SHARED )
set(SOURCES
DispatchLoaderDynamicSharedLibraryClient.cpp
)
target_link_libraries( DispatchLoaderDynamicSharedLibraryClient PRIVATE DispatchLoaderDynamicSharedLibrary )
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(DispatchLoaderDynamicSharedLibraryClient
${HEADERS}
${SOURCES}
)
target_compile_definitions(DispatchLoaderDynamicSharedLibraryClient PRIVATE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1 VULKAN_HPP_STORAGE_SHARED)
target_link_libraries(DispatchLoaderDynamicSharedLibraryClient PRIVATE DispatchLoaderDynamicSharedLibrary)
if (UNIX)
target_link_libraries(DispatchLoaderDynamicSharedLibraryClient PRIVATE ${CMAKE_DL_LIBS})
if( UNIX )
target_link_libraries( DispatchLoaderDynamicSharedLibraryClient PRIVATE ${CMAKE_DL_LIBS} )
endif()
set_target_properties(DispatchLoaderDynamicSharedLibraryClient PROPERTIES FOLDER "Tests")
target_link_libraries(DispatchLoaderDynamicSharedLibraryClient PRIVATE utils)
set_target_properties( DispatchLoaderDynamicSharedLibraryClient PROPERTIES FOLDER "Tests" )
target_link_libraries( DispatchLoaderDynamicSharedLibraryClient PRIVATE utils )

View File

@@ -12,34 +12,17 @@
# 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 )
if (NOT TESTS_BUILD_ONLY_DYNAMIC)
if( NOT TESTS_BUILD_ONLY_DYNAMIC )
find_package( Vulkan REQUIRED )
find_package(Vulkan REQUIRED)
project(DispatchLoaderStatic LANGUAGES CXX)
set(HEADERS
)
set(SOURCES
DispatchLoaderStatic.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(DispatchLoaderStatic
${HEADERS}
${SOURCES}
)
if (UNIX)
target_link_libraries(DispatchLoaderStatic PRIVATE ${CMAKE_DL_LIBS})
endif()
set_target_properties(DispatchLoaderStatic PROPERTIES FOLDER "Tests")
target_link_libraries(DispatchLoaderStatic PRIVATE utils ${Vulkan_LIBRARIES})
vulkan_hpp__setup_test( NAME DispatchLoaderStatic )
if( UNIX )
target_link_libraries( DispatchLoaderStatic PRIVATE ${CMAKE_DL_LIBS} )
endif()
set_target_properties( DispatchLoaderStatic PROPERTIES FOLDER "Tests" )
target_link_libraries( DispatchLoaderStatic PRIVATE utils ${Vulkan_LIBRARIES} )
endif()

View File

@@ -12,24 +12,9 @@
# 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(ExtensionInspection LANGUAGES CXX)
vulkan_hpp__setup_test( NAME ExtensionInspection )
set(HEADERS
)
set(SOURCES
ExtensionInspection.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(ExtensionInspection
${HEADERS}
${SOURCES}
)
set_target_properties(ExtensionInspection PROPERTIES CXX_STANDARD 20 FOLDER "Tests")
target_link_libraries(ExtensionInspection PRIVATE utils)
set_target_properties( ExtensionInspection PROPERTIES CXX_STANDARD 20 FOLDER "Tests" )
target_link_libraries( ExtensionInspection PRIVATE utils )

View File

@@ -12,24 +12,9 @@
# 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(Flags LANGUAGES CXX)
vulkan_hpp__setup_test( NAME Flags )
set(HEADERS
)
set(SOURCES
Flags.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(Flags
${HEADERS}
${SOURCES}
)
set_target_properties(Flags PROPERTIES FOLDER "Tests")
target_link_libraries(Flags PRIVATE utils)
set_target_properties( Flags PROPERTIES FOLDER "Tests" )
target_link_libraries( Flags PRIVATE utils )

View File

@@ -12,24 +12,9 @@
# 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(FormatTraits LANGUAGES CXX)
vulkan_hpp__setup_test( NAME FormatTraits )
set(HEADERS
)
set(SOURCES
FormatTraits.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(FormatTraits
${HEADERS}
${SOURCES}
)
set_target_properties(FormatTraits PROPERTIES FOLDER "Tests")
target_link_libraries(FormatTraits PRIVATE utils)
set_target_properties( FormatTraits PROPERTIES FOLDER "Tests" )
target_link_libraries( FormatTraits PRIVATE utils )

View File

@@ -12,26 +12,11 @@
# 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 )
if (NOT TESTS_BUILD_ONLY_DYNAMIC)
project(Hash LANGUAGES CXX)
if( NOT TESTS_BUILD_ONLY_DYNAMIC )
vulkan_hpp__setup_test( NAME Hash )
set(HEADERS
)
set(SOURCES
Hash.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(Hash
${HEADERS}
${SOURCES}
)
set_target_properties(Hash PROPERTIES FOLDER "Tests")
target_link_libraries(Hash PRIVATE utils)
set_target_properties( Hash PROPERTIES FOLDER "Tests" )
target_link_libraries( Hash PRIVATE utils )
endif()

View File

@@ -12,27 +12,13 @@
# 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(NoExceptions LANGUAGES CXX)
vulkan_hpp__setup_test( NAME NoExceptions )
set(HEADERS
)
set(SOURCES
NoExceptions.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(NoExceptions
${HEADERS}
${SOURCES}
)
if (UNIX)
target_link_libraries(NoExceptions PRIVATE ${CMAKE_DL_LIBS})
if( UNIX )
target_link_libraries( NoExceptions PRIVATE ${CMAKE_DL_LIBS} )
endif ()
set_target_properties(NoExceptions PROPERTIES FOLDER "Tests")
target_link_libraries(NoExceptions PRIVATE utils)
set_target_properties( NoExceptions PROPERTIES FOLDER "Tests" )
target_link_libraries( NoExceptions PRIVATE utils )

View File

@@ -12,26 +12,11 @@
# 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 )
if (NOT TESTS_BUILD_ONLY_DYNAMIC)
project(StridedArrayProxy LANGUAGES CXX)
if( NOT TESTS_BUILD_ONLY_DYNAMIC )
vulkan_hpp__setup_test( NAME StridedArrayProxy )
set(HEADERS
)
set(SOURCES
StridedArrayProxy.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(StridedArrayProxy
${HEADERS}
${SOURCES}
)
set_target_properties(StridedArrayProxy PROPERTIES FOLDER "Tests")
target_link_libraries(StridedArrayProxy PRIVATE utils)
set_target_properties( StridedArrayProxy PROPERTIES FOLDER "Tests" )
target_link_libraries( StridedArrayProxy PRIVATE utils )
endif()

View File

@@ -12,28 +12,13 @@
# 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(StructureChain LANGUAGES CXX)
vulkan_hpp__setup_test( NAME StructureChain )
set(HEADERS
)
set(SOURCES
StructureChain.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(StructureChain
${HEADERS}
${SOURCES}
)
if (UNIX)
target_link_libraries(StructureChain PRIVATE ${CMAKE_DL_LIBS})
if( UNIX )
target_link_libraries( StructureChain PRIVATE ${CMAKE_DL_LIBS} )
endif()
set_target_properties(StructureChain PROPERTIES FOLDER "Tests")
target_link_libraries(StructureChain PRIVATE utils)
set_target_properties( StructureChain PROPERTIES FOLDER "Tests" )
target_link_libraries( StructureChain PRIVATE utils )

View File

@@ -12,24 +12,9 @@
# 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(UniqueHandle LANGUAGES CXX)
vulkan_hpp__setup_test( NAME UniqueHandle )
set(HEADERS
)
set(SOURCES
UniqueHandle.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_executable(UniqueHandle
${HEADERS}
${SOURCES}
)
set_target_properties(UniqueHandle PROPERTIES FOLDER "Tests")
target_link_libraries(UniqueHandle PRIVATE utils)
set_target_properties( UniqueHandle PROPERTIES FOLDER "Tests" )
target_link_libraries( UniqueHandle PRIVATE utils )

View File

@@ -12,28 +12,13 @@
# 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(UniqueHandleDefaultArguments LANGUAGES CXX)
vulkan_hpp__setup_library( NAME UniqueHandleDefaultArguments SOURCES UniqueHandleDefaultArguments.cpp )
set(HEADERS
)
set(SOURCES
UniqueHandleDefaultArguments.cpp
)
source_group(headers FILES ${HEADERS})
source_group(sources FILES ${SOURCES})
add_library(UniqueHandleDefaultArguments
${HEADERS}
${SOURCES}
)
if (UNIX)
target_link_libraries(UniqueHandleDefaultArguments PRIVATE ${CMAKE_DL_LIBS})
if( UNIX )
target_link_libraries( UniqueHandleDefaultArguments PRIVATE ${CMAKE_DL_LIBS} )
endif()
set_target_properties(UniqueHandleDefaultArguments PROPERTIES FOLDER "Tests")
target_link_libraries(UniqueHandleDefaultArguments PRIVATE utils)
set_target_properties( UniqueHandleDefaultArguments PROPERTIES FOLDER "Tests" )
target_link_libraries( UniqueHandleDefaultArguments PRIVATE utils )