chore(deps): try find system wide qrcodegencpp-cmake and use it
Signed-off-by: Puqns67 <me@puqns67.icu>
This commit is contained in:
parent
e665a257dc
commit
49dc9a5d3f
1 changed files with 15 additions and 9 deletions
|
@ -338,6 +338,9 @@ if(NOT Launcher_FORCE_BUNDLED_LIBS)
|
||||||
|
|
||||||
# Find cmark
|
# Find cmark
|
||||||
find_package(cmark QUIET)
|
find_package(cmark QUIET)
|
||||||
|
|
||||||
|
# Find qrcodegencpp-cmake
|
||||||
|
find_package(qrcodegencpp QUIET)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include(ECMQtDeclareLoggingCategory)
|
include(ECMQtDeclareLoggingCategory)
|
||||||
|
@ -528,11 +531,7 @@ if(NOT cmark_FOUND)
|
||||||
else()
|
else()
|
||||||
message(STATUS "Using system cmark")
|
message(STATUS "Using system cmark")
|
||||||
endif()
|
endif()
|
||||||
add_subdirectory(libraries/gamemode)
|
if(NOT qrcodegencpp_FOUND)
|
||||||
add_subdirectory(libraries/murmur2) # Hash for usage with the CurseForge API
|
|
||||||
add_subdirectory(libraries/qdcss) # css parser
|
|
||||||
|
|
||||||
# qr code generator
|
|
||||||
set(QRCODE_SOURCES
|
set(QRCODE_SOURCES
|
||||||
libraries/qrcodegenerator/cpp/qrcodegen.cpp
|
libraries/qrcodegenerator/cpp/qrcodegen.cpp
|
||||||
libraries/qrcodegenerator/cpp/qrcodegen.hpp
|
libraries/qrcodegenerator/cpp/qrcodegen.hpp
|
||||||
|
@ -540,6 +539,13 @@ set(QRCODE_SOURCES
|
||||||
add_library(qrcodegenerator STATIC ${QRCODE_SOURCES})
|
add_library(qrcodegenerator STATIC ${QRCODE_SOURCES})
|
||||||
target_include_directories(qrcodegenerator PUBLIC "libraries/qrcodegenerator/cpp/" )
|
target_include_directories(qrcodegenerator PUBLIC "libraries/qrcodegenerator/cpp/" )
|
||||||
generate_export_header(qrcodegenerator)
|
generate_export_header(qrcodegenerator)
|
||||||
|
else()
|
||||||
|
add_library(qrcodegenerator ALIAS qrcodegencpp::qrcodegencpp)
|
||||||
|
message(STATUS "Using system qrcodegencpp-cmake")
|
||||||
|
endif()
|
||||||
|
add_subdirectory(libraries/gamemode)
|
||||||
|
add_subdirectory(libraries/murmur2) # Hash for usage with the CurseForge API
|
||||||
|
add_subdirectory(libraries/qdcss) # css parser
|
||||||
|
|
||||||
############################### Built Artifacts ###############################
|
############################### Built Artifacts ###############################
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue