fixup

diff --git a/cmake/FindBCUR.cmake b/cmake/FindBCUR.cmake
index 44ce1bbc097c9545fce95a7a987b0696afae72c7..671ce4cda0cb8baf810edecc6536a1195fb0ddfe 100644 (file)
--- 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 3587f5bb8d9df41f8d96e7d2ca1c0c44fa0e38dc..1ff01908ee1b8a9941a46e604fef98f37b24a261 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -309,6 +309,7 @@ if (WITH_SCANNER)
             Qt::Multimedia
             Qt::MultimediaWidgets
             ${ZXING_LIBRARIES}
+            ${BCUR_LIBRARY}
     )
 endif()