From: gg Date: Fri, 9 Jan 2026 22:22:23 +0000 (-0500) Subject: fixup X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=5410323c245a30f7c87e6f77adad115bed5a7a6a;p=gamesguru%2Ffeather.git fixup --- diff --git a/cmake/FindBCUR.cmake b/cmake/FindBCUR.cmake index 44ce1bbc..671ce4cd 100644 --- a/cmake/FindBCUR.cmake +++ b/cmake/FindBCUR.cmake @@ -1,18 +1,12 @@ -message(STATUS "FindBCUR: Starting. Initial BCUR_INCLUDE_DIR=${BCUR_INCLUDE_DIR}") find_path(BCUR_INCLUDE_DIR "bcur/bc-ur.hpp") find_library(BCUR_LIBRARY bcur) -message(STATUS "FindBCUR: After find. BCUR_INCLUDE_DIR=${BCUR_INCLUDE_DIR}") - if (NOT BCUR_INCLUDE_DIR OR NOT BCUR_LIBRARY) MESSAGE(STATUS "Could not find installed BCUR, using vendored library instead") set(BCUR_VENDORED "ON") - set(BCUR_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/third-party CACHE PATH "Path to BCUR headers" FORCE) - set(BCUR_LIBRARY bcur_static CACHE STRING "BCUR library name" FORCE) - message(STATUS "Using vendored BCUR at ${BCUR_INCLUDE_DIR}") -else() - message(STATUS "Found installed BCUR at ${BCUR_INCLUDE_DIR}") + set(BCUR_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/third-party) + set(BCUR_LIBRARY bcur_static) endif() -message(STATUS "FindBCUR: Final BCUR PATH ${BCUR_INCLUDE_DIR}") -message(STATUS "FindBCUR: Final BCUR LIBRARY ${BCUR_LIBRARY}") \ No newline at end of file +message(STATUS "BCUR PATH ${BCUR_INCLUDE_DIR}") +message(STATUS "BCUR LIBRARY ${BCUR_LIBRARY}") \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3587f5bb..1ff01908 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -309,6 +309,7 @@ if (WITH_SCANNER) Qt::Multimedia Qt::MultimediaWidgets ${ZXING_LIBRARIES} + ${BCUR_LIBRARY} ) endif()