From ba4e21bbb07bbc98a60728a1564ec989db5da827 Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 20 Feb 2023 17:52:20 -0800 Subject: [PATCH 1/2] cmake: fix build with 3.16 --- thirdparty/cpm-imgui.cmake | 1 + thirdparty/tcbrindle_span/CMakeLists.txt | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/thirdparty/cpm-imgui.cmake b/thirdparty/cpm-imgui.cmake index d4cffc7d3..2afd71a2c 100644 --- a/thirdparty/cpm-imgui.cmake +++ b/thirdparty/cpm-imgui.cmake @@ -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 diff --git a/thirdparty/tcbrindle_span/CMakeLists.txt b/thirdparty/tcbrindle_span/CMakeLists.txt index a9a5bf643..19cf8e739 100644 --- a/thirdparty/tcbrindle_span/CMakeLists.txt +++ b/thirdparty/tcbrindle_span/CMakeLists.txt @@ -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) From d959ac9954e7edab487e64676cf61bb120961e0b Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 20 Feb 2023 17:53:09 -0800 Subject: [PATCH 2/2] thirdparty/cpm-discordrpc.cmake: fix GCC 9.4.0 Ubuntu link --- thirdparty/cpm-discordrpc.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/thirdparty/cpm-discordrpc.cmake b/thirdparty/cpm-discordrpc.cmake index 078ebaab5..2243bbc0f 100644 --- a/thirdparty/cpm-discordrpc.cmake +++ b/thirdparty/cpm-discordrpc.cmake @@ -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()