test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-11-30 03:08:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix FindBrotli.cmake ( static library)

Browse Source
This commit is contained in:
houzh 2022-12-12 03:03:29 +00:00
parent 307d280a57
commit 8c8b692546
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/modules/FindBrotli.cmake
View File

@ -1,5 +1,5 @@
find_package(PkgConfig)
pkg_check_modules(PC_BROTLIDEC libbrotlidec)
pkg_check_modules(PC_BROTLIDEC libbrotlicommon)
find_path(BROTLIDEC_INCLUDE_DIRS
NAMES brotli/decode.h
@ -8,28 +8,29 @@ find_path(BROTLIDEC_INCLUDE_DIRS
)
find_library(BROTLIDEC_LIBRARIES
NAMES brotlidec
NAMES brotlidec brotlidec-static
HINTS ${PC_BROTLIDEC_LIBDIR}
${PC_BROTLIDEC_LIBRARY_DIRS}
)
find_path(BROTLIDENC_INCLUDE_DIRS
find_path(BROTLIENC_INCLUDE_DIRS
NAMES brotli/encode.h
HINTS ${PC_BROTLIDEC_INCLUDEDIR}
${PC_BROTLIDEC_INCLUDE_DIRS}
)
find_library(BROTLIENC_LIBRARIES
NAMES brotlienc
NAMES brotlienc brotlienc-static
HINTS ${PC_BROTLIDEC_LIBDIR}
${PC_BROTLIDEC_LIBRARY_DIRS}
)
find_library(BROTLICOMMON_LIBRARIES
NAMES brotlicommon
NAMES brotlicommon brotlicommon-static
HINTS ${PC_BROTLIDEC_LIBDIR}
${PC_BROTLIDEC_LIBRARY_DIRS}
)
include(FindPackageHandleStandardArgs)
if(BROTLIDEC_INCLUDE_DIRS AND BROTLIDEC_LIBRARIES)
set(BROTLIDEC_FOUND TRUE)
set(BROTLIDEC_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES})

1
src/gui/view/view.cc
View File

@ -1458,6 +1458,7 @@ Parcelable View::onSaveInstanceState(){
}
return BaseSavedState.EMPTY_STATE;
#endif
return Parcelable();
}
void View::restoreHierarchyState(std::map<int,Parcelable>& container){