iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

attempting to fix CI builds once again

Browse Source
This commit is contained in:
CocoSimone
2022-10-29 12:27:24 +02:00
parent c40668e604
commit 6222e9ebfd
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
external/imgui/CMakeLists.txt vendored
View File

@@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 3.20)
project(imgui)
find_package(Vulkan REQUIRED)
find_package(SDL2 CONFIG REQUIRED)
add_library(imgui
@@ -24,5 +23,5 @@ if(WIN32)
add_compile_options(/EHa)
endif()
target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIR} ${Vulkan_INCLUDE_DIRS} imgui imgui/backends)
target_link_libraries(imgui PUBLIC SDL2::SDL2main SDL2::SDL2 Vulkan::Vulkan)
target_include_directories(imgui PUBLIC ${SDL2_INCLUDE_DIR} ../parallel-rdp/parallel-rdp-standalone/vulkan-headers/include imgui imgui/backends)
target_link_libraries(imgui PUBLIC SDL2::SDL2main SDL2::SDL2)

3
external/parallel-rdp/CMakeLists.txt vendored
View File

@@ -4,7 +4,6 @@ project(parallel-rdp)
file(GLOB_RECURSE parallel-rdp-cpp parallel-rdp-standalone/parallel-rdp/*.cpp)
find_package(SDL2 CONFIG REQUIRED)
find_package(Vulkan REQUIRED)
add_library(parallel-rdp
${parallel-rdp-cpp}
@@ -84,7 +83,7 @@ if(WIN32)
add_compile_options(/EHa)
endif()
target_link_libraries(parallel-rdp Vulkan::Vulkan SDL2::SDL2main SDL2::SDL2)
target_link_libraries(parallel-rdp SDL2::SDL2main SDL2::SDL2)
if(WIN32)
target_compile_definitions(parallel-rdp PUBLIC VK_USE_PLATFORM_WIN32_KHR)