aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Servatrice portable + cmake options

Browse source 
Use -DPORTABLE=1 to build a portable version
This commit is contained in:
marco 2015-08-25 21:25:13 +02:00
parent 4125d690fa
commit 0b94b47f72
4 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/CMakeLists.txt
View file

@ -333,3 +333,8 @@ Data = Resources\")
install(FILES ${WIN32SSLRUNTIME_LIBRARIES} DESTINATION ./) install(FILES ${WIN32SSLRUNTIME_LIBRARIES} DESTINATION ./)
endif() endif()
endif() endif()
#Compile a portable version, default off
option(PORTABLE "portable build" OFF)
IF(PORTABLE)
add_definitions(-DPORTABLE_BUILD)
endif()

5
oracle/CMakeLists.txt
View file

@ -238,3 +238,8 @@ Translations = Resources/translations\")
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\")
" COMPONENT Runtime) " COMPONENT Runtime)
endif() endif()
#Compile a portable version, default off
option(PORTABLE "portable build" OFF)
IF(PORTABLE)
add_definitions(-DPORTABLE_BUILD)
endif()

5
servatrice/CMakeLists.txt
View file

@ -194,3 +194,8 @@ Translations = Resources/translations\")
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/servatrice.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/servatrice.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
" COMPONENT Runtime) " COMPONENT Runtime)
endif() endif()
#Compile a portable version, default off
option(PORTABLE "portable build" OFF)
IF(PORTABLE)
add_definitions(-DPORTABLE_BUILD)
endif()

8
servatrice/src/settingscache.cpp
View file

@ -15,9 +15,11 @@ SettingsCache::SettingsCache(const QString & fileName, QSettings::Format format,
QString SettingsCache::guessConfigurationPath(QString & specificPath) QString SettingsCache::guessConfigurationPath(QString & specificPath)
{ {
const QString fileName="servatrice.ini"; const QString fileName="servatrice.ini";
#ifdef PORTABLE_BUILD
return fileName;
#endif
QString guessFileName; QString guessFileName;
// specific path // specific path
if(!specificPath.isEmpty() && QFile::exists(specificPath)) if(!specificPath.isEmpty() && QFile::exists(specificPath))
return specificPath; return specificPath;
@ -40,4 +42,4 @@ QString SettingsCache::guessConfigurationPath(QString & specificPath)
guessFileName = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/" + fileName; guessFileName = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/" + fileName;
#endif #endif
return guessFileName; return guessFileName;
} }