dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 05:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix Linux build (#2505)

Browse Source
This commit is contained in:
Le Tan 2024-05-24 01:09:33 -07:00 committed by GitHub
parent 898c82ec8f
commit f461c706d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CMakeLists.txt
View File

@ -144,9 +144,8 @@ else()
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
) )
# TODO: move them to data dir install(FILES ${VX_EXTRA_RESOURCE_FILES_RCC} DESTINATION ${CMAKE_INSTALL_DATADIR})
install(FILES ${VX_EXTRA_RESOURCE_FILES_RCC} DESTINATION ${CMAKE_INSTALL_BINDIR}) install(FILES ${VX_QM_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/translations" OPTIONAL)
install(FILES ${VX_QM_FILES} DESTINATION "${CMAKE_INSTALL_BINDIR}/translations" OPTIONAL)
set(desktop.path applications) set(desktop.path applications)
set(desktop.files data/core/vnote.desktop) set(desktop.files data/core/vnote.desktop)
@ -166,7 +165,7 @@ else()
set(iconsvg.files data/core/logo/vnote.svg) set(iconsvg.files data/core/logo/vnote.svg)
foreach(item IN ITEMS desktop icon16 icon32 icon48 icon64 icon128 icon256 iconsvg) foreach(item IN ITEMS desktop icon16 icon32 icon48 icon64 icon128 icon256 iconsvg)
install(FILES ${CMAKE_CURRENT_LIST_DIR}/${${item}.files} install(FILES ${CMAKE_CURRENT_LIST_DIR}/${${item}.files}
DESTINATION share/${${item}.path} DESTINATION ${CMAKE_INSTALL_DATADIR}/${${item}.path}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
endforeach() endforeach()
endif() endif()

7
src/core/configmgr.cpp
View File

@ -581,10 +581,15 @@ void ConfigMgr::initAppPrefixPath()
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
QDir localBinDir(app_dir_path); QDir localBinDir(app_dir_path);
if (localBinDir.exists("../local/bin/vnote")) { if (localBinDir.exists("../local/bin/vnote")) {
auto app_dir_path2 = localBinDir.cleanPath(localBinDir.filePath("../local/bin")); auto app_dir_path2 = localBinDir.cleanPath(localBinDir.filePath("../local/share"));
qInfo() << "app prefix path: " << app_dir_path2; qInfo() << "app prefix path: " << app_dir_path2;
potential_dirs << app_dir_path2; potential_dirs << app_dir_path2;
} }
if (localBinDir.exists("../share")) {
auto app_dir_path3 = localBinDir.cleanPath(localBinDir.filePath("../share"));
qInfo() << "app prefix path: " << app_dir_path3;
potential_dirs << app_dir_path3;
}
#elif defined(Q_OS_MACOS) #elif defined(Q_OS_MACOS)
QDir localBinDir(app_dir_path); QDir localBinDir(app_dir_path);
if (localBinDir.exists("../Resources")) { if (localBinDir.exists("../Resources")) {