Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-27 16:29:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix data path on Mac OS.

Browse Source
This commit is contained in:
Felix Geyer 2012-05-21 17:55:09 +02:00
parent bde397503e
commit ca7c59d313
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -114,7 +114,7 @@ if(MINGW)
set(DATA_INSTALL_DIR "share") set(DATA_INSTALL_DIR "share")
elseif(APPLE) elseif(APPLE)
set(BIN_INSTALL_DIR "") set(BIN_INSTALL_DIR "")
set(DATA_INSTALL_DIR "Contents/Resources") set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources")
else(MINGW) else(MINGW)
set(BIN_INSTALL_DIR "bin") set(BIN_INSTALL_DIR "bin")
set(DATA_INSTALL_DIR "share/keepassx") set(DATA_INSTALL_DIR "share/keepassx")

2
src/CMakeLists.txt
View File

@ -147,5 +147,5 @@ add_library( keepassx_core STATIC ${keepassx_SOURCES} )
add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE main.cpp ) add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE main.cpp )
target_link_libraries( ${PROGNAME} keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES} ) target_link_libraries( ${PROGNAME} keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES} )
install(TARGETS ${PROGNAME} install(TARGETS ${PROGNAME}
BUNDLE DESTINATION . BUNDLE DESTINATION . COMPONENT Runtime
RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT Runtime) RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT Runtime)

2
src/core/DataPath.cpp
View File

@ -68,7 +68,7 @@ DataPath::DataPath()
} }
#endif #endif
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
else if (testSetDir(QCoreApplication::applicationDirPath() + "/../Resources/keepassx")) { else if (testSetDir(QCoreApplication::applicationDirPath() + "/../Resources")) {
} }
#endif #endif
#ifdef Q_WS_WIN #ifdef Q_WS_WIN