AstralTransRocketries/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-08-03 19:37:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix the MSVC arm build?

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-07-18 20:58:15 +03:00
parent 41dc5826da
commit 8ae7927166
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -338,7 +338,15 @@ if(Launcher_QT_VERSION_MAJOR EQUAL 6)
endif() endif()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(libarchive REQUIRED IMPORTED_TARGET libarchive) # Find libqrencode
## NOTE(@getchoo): Never use pkg-config with MSVC since the vcpkg port makes our install bundle fail to find the dll
if(PkgConfig_FOUND AND NOT MSVC)
pkg_check_modules(libarchive REQUIRED IMPORTED_TARGET libarchive)
set(LIBARCHIVE_LIBRARY PkgConfig::libarchive)
else()
find_library(LibArchive REQUIRED)
set(LIBARCHIVE_LIBRARY LibArchive::LibArchive)
endif()
if(NOT Launcher_FORCE_BUNDLED_LIBS) if(NOT Launcher_FORCE_BUNDLED_LIBS)
# Find toml++ # Find toml++

4
launcher/CMakeLists.txt
View File

@ -1332,7 +1332,7 @@ target_link_libraries(Launcher_logic
BuildConfig BuildConfig
Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Widgets
qrcodegenerator qrcodegenerator
PkgConfig::libarchive ${LIBARCHIVE_LIBRARY}
) )
if(TARGET PkgConfig::tomlplusplus) if(TARGET PkgConfig::tomlplusplus)
target_link_libraries(Launcher_logic PkgConfig::tomlplusplus) target_link_libraries(Launcher_logic PkgConfig::tomlplusplus)
@ -1433,7 +1433,7 @@ if(Launcher_BUILD_UPDATER)
Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Network
${Launcher_QT_LIBS} ${Launcher_QT_LIBS}
cmark::cmark cmark::cmark
PkgConfig::libarchive ${LIBARCHIVE_LIBRARY}
) )
add_executable("${Launcher_Name}_updater" WIN32 updater/prismupdater/updater_main.cpp) add_executable("${Launcher_Name}_updater" WIN32 updater/prismupdater/updater_main.cpp)