hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 00:14:06 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge pull request #805 from shenlebantongying/fix_cmake_datadir

Browse source 
fix: define PROGRAM_DATA_DIR for cmake
This commit is contained in:
xiaoyifang 2023-06-03 23:30:24 +08:00 committed by GitHub
parent 87e2091214 849b1345e1
commit 4fc21074ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -95,6 +95,11 @@ endif ()
# Note: used as c++ string thus need surrounding " " # Note: used as c++ string thus need surrounding " "
add_compile_definitions(PROGRAM_VERSION="${PROJECT_VERSION}") add_compile_definitions(PROGRAM_VERSION="${PROJECT_VERSION}")
if (LINUX)
# see: config.cc -> getProgramDataDir
add_compile_definitions(PROGRAM_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/goldendict")
endif ()
target_link_libraries(${GOLDENDICT} PRIVATE target_link_libraries(${GOLDENDICT} PRIVATE
Qt6::Xml Qt6::Xml
Qt6::Concurrent Qt6::Concurrent

2
src/config.cc
View file

@ -2276,7 +2276,7 @@ QString getProgramDataDir() noexcept
{ {
if ( isPortableVersion() ) if ( isPortableVersion() )
return QCoreApplication::applicationDirPath(); return QCoreApplication::applicationDirPath();
// TODO: rewrite this in QStandardPaths::AppDataLocation
#ifdef PROGRAM_DATA_DIR #ifdef PROGRAM_DATA_DIR
return PROGRAM_DATA_DIR; return PROGRAM_DATA_DIR;
#else #else