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

Speed up CI by using ninja and parallel build (#1347)

Browse Source 
* chore(CI): speed up CI by using ninja and parallel build

* chore(CI): align compiler for c and cxx

* fix(samples): add dependency to generator

* fix(cmake): get rid of file glob

* chore(CI): use clang on mac

glfw don't support gcc on mac

* fix(sample): add depencency on build_vulkan_hpp

* fix(cmake): make sure every target in tests and samples link to utils
This commit is contained in:
Jinesi Yelizati
2022-07-07 16:22:21 +08:00
committed by GitHub
parent 193c8e4628
commit 9748e47228
27 changed files with 194 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ArrayProxy/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if (NOT TESTS_BUILD_ONLY_DYNAMIC)
)
set_target_properties(ArrayProxy PROPERTIES FOLDER "Tests")
target_link_libraries(ArrayProxy "${Vulkan_LIBRARIES}")
target_link_libraries(ArrayProxy PRIVATE utils)
endif()

2
tests/ArrayProxyNoTemporaries/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if (NOT TESTS_BUILD_ONLY_DYNAMIC)
)
set_target_properties(ArrayProxyNoTemporaries PROPERTIES FOLDER "Tests")
target_link_libraries(ArrayProxyNoTemporaries "${Vulkan_LIBRARIES}")
target_link_libraries(ArrayProxyNoTemporaries PRIVATE utils)
endif()

24
tests/CMakeLists.txt
View File

@@ -38,8 +38,6 @@ elseif(UNIX)
add_definitions(-DVK_USE_PLATFORM_XLIB_KHR)
endif()
FILE (GLOB linkunits ${CMAKE_CURRENT_SOURCE_DIR}/*)
if (TESTS_BUILD_WITH_LOCAL_VULKAN_HPP)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include")
@@ -49,11 +47,17 @@ endif()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../glm")
FOREACH( linkunit ${linkunits} )
if( IS_DIRECTORY ${linkunit} )
if( EXISTS ${linkunit}/CMakeLists.txt )
string( REGEX REPLACE "^.*/([^/]*)$" "\\1" LINK_NAME ${linkunit} )
add_subdirectory( ${LINK_NAME} )
endif()
endif()
ENDFOREACH( linkunit ${linkunits} )
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(FormatTraits)
add_subdirectory(Hash)
add_subdirectory(NoExceptions)
add_subdirectory(StructureChain)
add_subdirectory(UniqueHandle)
add_subdirectory(UniqueHandleDefaultArguments)

2
tests/DesignatedInitializers/CMakeLists.txt
View File

@@ -35,5 +35,5 @@ if (NOT TESTS_BUILD_ONLY_DYNAMIC)
)
set_target_properties(DesignatedInitializers PROPERTIES FOLDER "Tests")
target_link_libraries(DesignatedInitializers "${Vulkan_LIBRARIES}")
target_link_libraries(DesignatedInitializers PRIVATE utils)
endif()

2
tests/DeviceFunctions/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if (NOT TESTS_BUILD_ONLY_DYNAMIC)
)
set_target_properties(DeviceFunctions PROPERTIES FOLDER "Tests")
target_link_libraries(DeviceFunctions "${Vulkan_LIBRARIES}")
target_link_libraries(DeviceFunctions PRIVATE utils)
endif()

3
tests/DispatchLoaderDynamic/CMakeLists.txt
View File

@@ -32,7 +32,8 @@ add_executable(DispatchLoaderDynamic
)
if (UNIX)
target_link_libraries(DispatchLoaderDynamic "-ldl")
target_link_libraries(DispatchLoaderDynamic PRIVATE ${CMAKE_DL_LIBS})
endif()
set_target_properties(DispatchLoaderDynamic PROPERTIES FOLDER "Tests")
target_link_libraries(DispatchLoaderDynamic PRIVATE utils)

3
tests/DispatchLoaderDynamicSharedLibrary/CMakeLists.txt
View File

@@ -34,7 +34,8 @@ add_library(DispatchLoaderDynamicSharedLibrary SHARED
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 "-ldl")
target_link_libraries(DispatchLoaderDynamicSharedLibrary PRIVATE ${CMAKE_DL_LIBS})
endif()
set_target_properties(DispatchLoaderDynamicSharedLibrary PROPERTIES FOLDER "Tests")
target_link_libraries(DispatchLoaderDynamicSharedLibrary PRIVATE utils)

5
tests/DispatchLoaderDynamicSharedLibraryClient/CMakeLists.txt
View File

@@ -33,10 +33,11 @@ add_executable(DispatchLoaderDynamicSharedLibraryClient
target_compile_definitions(DispatchLoaderDynamicSharedLibraryClient PRIVATE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1 VULKAN_HPP_STORAGE_SHARED)
target_link_libraries(DispatchLoaderDynamicSharedLibraryClient DispatchLoaderDynamicSharedLibrary)
target_link_libraries(DispatchLoaderDynamicSharedLibraryClient PRIVATE DispatchLoaderDynamicSharedLibrary)
if (UNIX)
target_link_libraries(DispatchLoaderDynamicSharedLibraryClient "-ldl")
target_link_libraries(DispatchLoaderDynamicSharedLibraryClient PRIVATE ${CMAKE_DL_LIBS})
endif()
set_target_properties(DispatchLoaderDynamicSharedLibraryClient PROPERTIES FOLDER "Tests")
target_link_libraries(DispatchLoaderDynamicSharedLibraryClient PRIVATE utils)

5
tests/DispatchLoaderStatic/CMakeLists.txt
View File

@@ -34,11 +34,10 @@ if (NOT TESTS_BUILD_ONLY_DYNAMIC)
)
if (UNIX)
target_link_libraries(DispatchLoaderStatic "-ldl")
target_link_libraries(DispatchLoaderStatic PRIVATE ${CMAKE_DL_LIBS})
endif()
target_link_libraries(DispatchLoaderStatic "${Vulkan_LIBRARIES}")
set_target_properties(DispatchLoaderStatic PROPERTIES FOLDER "Tests")
target_link_libraries(DispatchLoaderStatic PRIVATE utils)
endif()

2
tests/FormatTraits/CMakeLists.txt
View File

@@ -32,4 +32,4 @@ add_executable(FormatTraits
)
set_target_properties(FormatTraits PROPERTIES FOLDER "Tests")
target_link_libraries(FormatTraits "${Vulkan_LIBRARIES}")
target_link_libraries(FormatTraits PRIVATE utils)

2
tests/Hash/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ if (NOT TESTS_BUILD_ONLY_DYNAMIC)
)
set_target_properties(Hash PROPERTIES FOLDER "Tests")
target_link_libraries(Hash "${Vulkan_LIBRARIES}")
target_link_libraries(Hash PRIVATE utils)
endif()

6
tests/NoExceptions/CMakeLists.txt
View File

@@ -30,7 +30,9 @@ add_executable(NoExceptions
${HEADERS}
${SOURCES}
)
target_link_libraries(NoExceptions ${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)

3
tests/StructureChain/CMakeLists.txt
View File

@@ -32,7 +32,8 @@ add_executable(StructureChain
)
if (UNIX)
target_link_libraries(StructureChain "-ldl")
target_link_libraries(StructureChain PRIVATE ${CMAKE_DL_LIBS})
endif()
set_target_properties(StructureChain PROPERTIES FOLDER "Tests")
target_link_libraries(StructureChain PRIVATE utils)

3
tests/UniqueHandleDefaultArguments/CMakeLists.txt
View File

@@ -32,7 +32,8 @@ add_library(UniqueHandleDefaultArguments
)
if (UNIX)
target_link_libraries(UniqueHandleDefaultArguments "-ldl")
target_link_libraries(UniqueHandleDefaultArguments PRIVATE ${CMAKE_DL_LIBS})
endif()
set_target_properties(UniqueHandleDefaultArguments PROPERTIES FOLDER "Tests")
target_link_libraries(UniqueHandleDefaultArguments PRIVATE utils)