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

fix FindEXPAT.cmake

Browse Source
This commit is contained in:
houzh 2022-12-12 08:24:10 +00:00
parent 8c8b692546
commit 3fd89416a7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/modules/FindEXPAT.cmake
View File

@ -14,9 +14,6 @@ find_library(EXPAT_LIBRARY
${PC_EXPAT_LIBRARY_DIRS}
)
if(EXPAT_INCLUDE_DIR AND NOT EXPAT_LIBRARY)
set(EXPAT_LIBRARY "-L${CMAKE_INSTALL_PREFIX}/lib -lexpat")
endif()
if(EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
set(EXPAT_FOUND TRUE)
set(EXPAT_INCLUDE_DIRS ${EXPAT_INCLUDE_DIR})

8
cmake/options.cmake
View File

@ -31,7 +31,7 @@ find_package(Pixman REQUIRED)
find_package(Cairo REQUIRED)
find_package(OpenSSL)
find_package(Fontconfig REQUIRED)
find_package(Brotli REQUIRED)
find_package(Brotli)
find_package(BZip2 REQUIRED)
find_package(UniBreak REQUIRED)
@ -47,7 +47,6 @@ list(APPEND CDROID_DEPLIBS
${EXPAT_LIBRARIES}
${JSONCPP_LIBRARIES}
${ZLIB_LIBRARIES}
${BROTLIDEC_LIBRARIES}
${BZIP2_LIBRARIES}
)
if(ENABLE_FRIBIDI)
@ -63,7 +62,6 @@ list(APPEND CDROID_DEPINCLUDES
${PNG_INCLUDE_DIRS}
${JPEG_INCLUDE_DIRSS}
${ZIP_INCLUDE_DIRS}
${BROTLI_INCLUDE_DIRS}
${EXPAT_INCLUDE_DIRS}
${JSONCPP_INCLUDE_DIRS}
${CAIRO_INCLUDE_DIRS}
@ -72,6 +70,10 @@ list(APPEND CDROID_DEPINCLUDES
${FRIBIDI_INCLUDE_DIRS}
${TURBOJPEG_INCLUDE_DIRS}
)
if(BROTLI_FOUND)
list(APPEND CDROID_DEPLIBS ${BROTLIDEC_LIBRARIES})
list(APPEND CDROID_DEPINCLUDES ${BROTLI_INCLUDE_DIRS})
endif(BROTLI_FOUND)
message("CDROID_DEPLIBS=${CDROID_DEPLIBS}")
if(OPENSSL_FOUND)
list(APPEND CDROID_DEPINCLUDES ${OPENSSL_INCLUDE_DIRS})