xuanchi/XCEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: upgrade project targets to c++20

Browse Source
This commit is contained in:
ssdfasd
2026-04-05 03:05:40 +08:00
parent 811958351e
commit 6a5c23dce2
10 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.15) cmake_minimum_required(VERSION 3.15)
project(XCEngine) project(XCEngine)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
enable_testing() enable_testing()

2
editor/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.15) cmake_minimum_required(VERSION 3.15)
project(XCEditor VERSION 1.0 LANGUAGES CXX) project(XCEditor VERSION 1.0 LANGUAGES CXX)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
get_filename_component(XCENGINE_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUTE) get_filename_component(XCENGINE_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUTE)

1
editor/src/UI/Widgets.h
View File

@@ -7,6 +7,7 @@
#include <XCEngine/Debug/Logger.h> #include <XCEngine/Debug/Logger.h>
#include <imgui.h> #include <imgui.h>
#include <imgui_internal.h>
#include <string> #include <string>
namespace XCEngine { namespace XCEngine {

2
engine/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.15) cmake_minimum_required(VERSION 3.15)
project(XCEngineLib) project(XCEngineLib)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(XCENGINE_VULKAN_SDK_HINT "$ENV{VULKAN_SDK}") set(XCENGINE_VULKAN_SDK_HINT "$ENV{VULKAN_SDK}")

2
engine/include/XCEngine/Core/Containers/Array.h
View File

@@ -261,7 +261,7 @@ void Array<T>::Reallocate(size_t newCapacity) {
T* newData = nullptr; T* newData = nullptr;
if (newCapacity > 0) { if (newCapacity > 0) {
newData = static_cast<T*>(::operator new(newCapacity * sizeof(T))); newData = static_cast<T*>(::operator new(newCapacity * sizeof(T)));
size_t count = std::min(m_size, newCapacity); size_t count = (std::min)(m_size, newCapacity);
if (count > 0) { if (count > 0) {
CopyRange(m_data, newData, count); CopyRange(m_data, newData, count);
} }

2
tests/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.15) cmake_minimum_required(VERSION 3.15)
project(XCEngineTests) project(XCEngineTests)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
# ============================================================ # ============================================================

2
tests/RHI/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
project(RHIEngineTests) project(RHIEngineTests)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_subdirectory(D3D12) add_subdirectory(D3D12)

2
tests/RHI/D3D12/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
project(rhi_d3d12_tests) project(rhi_d3d12_tests)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_subdirectory(unit) add_subdirectory(unit)

2
tests/RHI/OpenGL/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
project(OpenGLEngineTests) project(OpenGLEngineTests)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_subdirectory(unit) add_subdirectory(unit)

2
tests/RHI/Vulkan/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
project(rhi_vulkan_tests) project(rhi_vulkan_tests)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_subdirectory(unit) add_subdirectory(unit)