From 074f2c41bc348bbae6c4958824e4beda4c8d5dcb Mon Sep 17 00:00:00 2001 From: cursey Date: Sun, 19 Nov 2023 16:35:14 -0800 Subject: [PATCH] Update Vcpkg to 2023.10.19 --- CMakeLists.txt | 4 ++-- Kanan/PatchMod.cpp | 2 +- Kanan/metrics_gui/metrics_gui.cpp | 2 +- cmake.toml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 781a68a..33dbc98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,8 +33,8 @@ set(VCPKG_TARGET_TRIPLET x64-windows-static) if(CMKR_ROOT_PROJECT AND NOT CMKR_DISABLE_VCPKG) include(FetchContent) - message(STATUS "Fetching vcpkg (2022.05.10)...") - FetchContent_Declare(vcpkg URL "https://github.com/microsoft/vcpkg/archive/refs/tags/2022.05.10.tar.gz") + message(STATUS "Fetching vcpkg (2023.10.19)...") + FetchContent_Declare(vcpkg URL "https://github.com/microsoft/vcpkg/archive/refs/tags/2023.10.19.tar.gz") FetchContent_MakeAvailable(vcpkg) include("${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake") endif() diff --git a/Kanan/PatchMod.cpp b/Kanan/PatchMod.cpp index 7ea6896..6e485c5 100644 --- a/Kanan/PatchMod.cpp +++ b/Kanan/PatchMod.cpp @@ -64,7 +64,7 @@ namespace kanan { m_configName = m_patchName; // Remove spaces. - m_configName.erase(remove_if(begin(m_configName), end(m_configName), isspace), end(m_configName)); + erase_if(m_configName, [](auto x) { return isspace(x); }); // Add .Enabled m_configName.append(".Enabled"); diff --git a/Kanan/metrics_gui/metrics_gui.cpp b/Kanan/metrics_gui/metrics_gui.cpp index 434630d..e487c57 100644 --- a/Kanan/metrics_gui/metrics_gui.cpp +++ b/Kanan/metrics_gui/metrics_gui.cpp @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "imgui.h" #define IMGUI_DEFINE_MATH_OPERATORS +#include "imgui.h" #include "imgui_internal.h" #include "metrics_gui.h" #include "countof.h" diff --git a/cmake.toml b/cmake.toml index 792ce21..f9513e9 100644 --- a/cmake.toml +++ b/cmake.toml @@ -6,7 +6,7 @@ set(VCPKG_TARGET_TRIPLET x64-windows-static) """ [vcpkg] -version = "2022.05.10" +version = "2023.10.19" packages = ["bddisasm", "imgui[freetype,dx9-binding,win32-binding]", "nlohmann-json", "stb"] [find-package]