From 518d57f6696d85f93009fc0b16eb4c622dbef823 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Fri, 15 Apr 2022 21:01:44 -0400 Subject: [PATCH] Fix compilation on MSVC This simply bumps the libxiv commit, which was the issue when building on Windows. --- CMakeLists.txt | 6 +++--- external/libxiv | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e7cc66..89a6c86 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ if(TARGET Qt5Keychain::Qt5Keychain) set(LIBRARIES Qt5Keychain::Qt5Keychain ${LIBRARIES}) set(KEYCHAIN_INCLUDE_DIRS ${QTKEYCHAIN_INCLUDE_DIRS}/qt5keychain) # this is to be consistent with the built-in lib? else() - message("Using built-in qt keychain") + message("Using downloaded qtkeychain") FetchContent_Declare( qtkeychain @@ -79,7 +79,7 @@ if(TARGET QuaZip::QuaZip) set(LIBRARIES QuaZip::QuaZip ${LIBRARIES}) else() - message("Using built-in quazip") + message("Using downloaded quazip") FetchContent_Declare( quazip @@ -105,7 +105,7 @@ if(TARGET fmt::fmt) set(LIBRARIES fmt::fmt ${LIBRARIES}) else() - message("Using built-in fmt") + message("Using downloaded fmt") FetchContent_Declare( fmt diff --git a/external/libxiv b/external/libxiv index ba13bab..79c482a 160000 --- a/external/libxiv +++ b/external/libxiv @@ -1 +1 @@ -Subproject commit ba13bab4b7685be9fe20baa4f38e2534c7739942 +Subproject commit 79c482ac97f212cd968ea8717645a05b5bd40fac