Skip to content

Commit b8ab397

Browse files
fix freexl for flatpak (#5714)
1 parent 0e8badd commit b8ab397

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Desktop/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ target_link_libraries(
148148
OpenSSL::Crypto
149149
# FreeXL
150150
${LIBFREEXL_LIBRARIES}
151-
$<$<NOT:$<BOOL:${LINUX_LOCAL_BUILD}>>:freexl::freexl>
151+
$<$<NOT:$<BOOL:${LINUX}>>:freexl::freexl>
152152
# ReadStat -----------------------------------
153153
${LIBREADSTAT_LIBRARIES}
154154
# MinGW's ReadStat

Tools/CMake/Libraries.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ if(LINUX)
201201

202202
# ---- FreeXL ----
203203
message(CHECK_START "Looking for `libfreexl`")
204-
set(LIBFREEXL_INCLUDE_DIRS /usr/include)
205-
set(LIBFREEXL_LIBRARY_DIRS /usr/local/lib /usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/aarch64-linux-gnu)
204+
set(LIBFREEXL_INCLUDE_DIRS /usr/include /app/lib64/)
205+
set(LIBFREEXL_LIBRARY_DIRS /usr/local/lib /usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/aarch64-linux-gnu /app/include/)
206206

207207
message(CHECK_START "Looking for libfreexl.so")
208208
find_library(LIBFREEXL_LIBRARIES libfreexl.so

0 commit comments

Comments
 (0)