mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-02-16 10:36:09 +00:00
Merge branch 'fix-cmake-ubuntu-2004' into 'master'
Fix CMake build on Ubuntu 20.04 See merge request KartKrew/Kart!948
This commit is contained in:
commit
c118b3cff1
3 changed files with 6 additions and 1 deletions
1
thirdparty/cpm-discordrpc.cmake
vendored
1
thirdparty/cpm-discordrpc.cmake
vendored
|
|
@ -58,6 +58,7 @@ if(DiscordRPC_ADDED)
|
|||
target_sources(discord-rpc PRIVATE
|
||||
"${DiscordRPC_SOURCE_DIR}/src/discord_register_linux.cpp"
|
||||
)
|
||||
target_link_libraries(discord-rpc PUBLIC pthread)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
1
thirdparty/cpm-imgui.cmake
vendored
1
thirdparty/cpm-imgui.cmake
vendored
|
|
@ -21,6 +21,7 @@ if(imgui_ADDED)
|
|||
|
||||
add_custom_command(
|
||||
OUTPUT "${imgui_BINARY_DIR}/include/imgui.h" "${imgui_BINARY_DIR}/include/imconfig.h"
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${imgui_BINARY_DIR}/include"
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${imgui_SOURCE_DIR}/imgui.h" "${imgui_SOURCE_DIR}/imconfig.h" "${imgui_BINARY_DIR}/include"
|
||||
DEPENDS "${imgui_SOURCE_DIR}/imgui.h" "${imgui_SOURCE_DIR}/imconfig.h"
|
||||
VERBATIM
|
||||
|
|
|
|||
5
thirdparty/tcbrindle_span/CMakeLists.txt
vendored
5
thirdparty/tcbrindle_span/CMakeLists.txt
vendored
|
|
@ -2,7 +2,10 @@
|
|||
# Portable implementation of C++20 std::span
|
||||
# Boost License 1.0
|
||||
|
||||
add_library(tcbrindle_span INTERFACE include/tcb/span.hpp)
|
||||
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
|
||||
|
||||
add_library(tcbrindle_span INTERFACE)
|
||||
target_sources(tcbrindle_span INTERFACE include/tcb/span.hpp)
|
||||
target_include_directories(tcbrindle_span INTERFACE include)
|
||||
|
||||
add_library(tcbrindle::span ALIAS tcbrindle_span)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue