fix

diff --git a/cmake/FindBCUR.cmake b/cmake/FindBCUR.cmake
index 671ce4cda0cb8baf810edecc6536a1195fb0ddfe..44ce1bbc097c9545fce95a7a987b0696afae72c7 100644 (file)
--- a/cmake/FindBCUR.cmake
+++ b/cmake/FindBCUR.cmake
@@ -1,12 +1,18 @@
+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)
-    set(BCUR_LIBRARY bcur_static)
+    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}")
 endif()
 
-message(STATUS "BCUR PATH ${BCUR_INCLUDE_DIR}")
-message(STATUS "BCUR LIBRARY ${BCUR_LIBRARY}")
\ No newline at end of file
+message(STATUS "FindBCUR: Final BCUR PATH ${BCUR_INCLUDE_DIR}")
+message(STATUS "FindBCUR: Final BCUR LIBRARY ${BCUR_LIBRARY}")
\ No newline at end of file

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f94d2e38d875e28a5469cefcb69f908050337c14..3587f5bb8d9df41f8d96e7d2ca1c0c44fa0e38dc 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -182,7 +182,7 @@ target_include_directories(feather PUBLIC
         ${LIBZIP_INCLUDE_DIRS}
         ${ZLIB_INCLUDE_DIRS}
         ${POLYSEED_INCLUDE_DIR}
-        ${BCUR_INCLUDE_DIR}
+
 )
 
 target_compile_definitions(feather PRIVATE FEATHER_VERSION="${DETECTED_FEATHER_VERSION}")
@@ -194,6 +194,7 @@ if(WITH_SCANNER)
             ${QtMultimedia_INCLUDE_DIRS}
             ${QtMultimediaWidgets_INCLUDE_DIRS}
             ${ZXING_INCLUDE_DIRS}
+            ${BCUR_INCLUDE_DIR}
     )
 endif()
 

diff --git a/src/model/SubaddressProxyModel.h b/src/model/SubaddressProxyModel.h
index 833c6f25dd528bb56887c4e3870d1f0a7d895ba9..38069ed1e41b96651d8346d70ea2530835576fae 100644 (file)
--- a/src/model/SubaddressProxyModel.h
+++ b/src/model/SubaddressProxyModel.h
@@ -20,7 +20,7 @@ public slots:
     void setSearchFilter(const QString& searchString){
         m_searchRegExp.setPattern(searchString);
         m_searchCaseSensitiveRegExp.setPattern(searchString);
-        invalidate();
+        invalidateFilter();
     }
 
 private: