Skip to content
This repository has been archived by the owner on Jan 23, 2024. It is now read-only.

Update Vcpkg to 2023.10.19 #329

Merged
merged 1 commit into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion Kanan/PatchMod.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion Kanan/metrics_gui/metrics_gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmake.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down