aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)Author
2018-10-09build system: work around strange cmake issueGravatar Dirk Hohndel
On both Mac and Linux cmake 3.12 complained that there were "no sources given to target" for the Subsurface-mobile target, which made no sense at all (easy enough to add debug output to ensure there were, in fact, sources given in the call to add_executable()). But splitting this across two lines like this seems to make it work both for older and newer cmake versions. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-10-01Revert "Revert "QML UI: newer Kirigami and fallout""Gravatar Jan Mulder
This reverts commit a5db03c2b32115b14e4b83501a0771b186d87913. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-28Revert "QML UI: newer Kirigami and fallout"Gravatar Dirk Hohndel
Turns out that Jan found an issue with the latest Kirigami, so let's go back to the known good one. This reverts commit 17ec95e70c3ae58d505b8c3cbbaf6815186b93cb. Suggested-by: Jan Mulder <jlmulder@xs4all.nl> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-27QML UI: newer Kirigami and falloutGravatar Jan Mulder
Update to the master of today, and no issues detected on mobile-on-desktop and Android. Only, the ugly border is back as the magic hack of 0b16b547ae2aefb1 failed due to the patch file that errored. So that is fixed too. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-09-09Fix appdataGravatar Alexander Wilms
Use correct format, create script to update the version and release date in the appdata. [Dirk Hohndel: call said script during the build process] Signed-off-by: Alexander Wilms <f.alexander.wilms@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-03Build: suppress inconsistent-missing-override warnings on clangGravatar Berthold Stoeger
In a previous commit all override-modifiers were thrown out owing to warning floods caused by the inconsistent-missing-override flag on clang. Re-adding overrides is now very painful because it's an all-or-nothing thing. Let's disable the warning for now. If we reastablished good coverage with override, we might think about re-enabling the warning. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-12tests: make qml test harnessGravatar jan Iversen
build a qml test runner that includes ssrf interface The qml test runner allows having qml test files. Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12ssrf: add QuickTest to test libraries.Gravatar jan Iversen
QuickTest enables QML TestCase which are used for qml testing Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12ssrf: move functions from mobile-helper to mobile-mainGravatar jan Iversen
Move few mobile only functions from mobile-helper to mobile-main remove subsurface-mobile-helper file structure is now subsurface-*-main.cpp + subsurface-helper.cpp Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12ssrf: combine subsurface-*-helper into subsurface-helperGravatar jan Iversen
combine shared functions like init_ui and run_ui in one file Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12ssrf: add shared helper fileGravatar jan Iversen
add subsurface-helper.cpp to share functions between mobile and desktop move mobile qml registrations to a shared function (avoiding differences in registrations) Target is to replace current subsurface-desktop-main + subsurface-desktop-helper and subsurface-mobile-main + subsurface-mobile-helper with subsurface-*-main + subsurface-helper Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-10build-system: we always require QtQuick and QtLocationGravatar Dirk Hohndel
No point in listing them twice as extra components. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-08Install subsurface.appdata.xmlGravatar Alexander Wilms
This is required to make Subsurface show up in Gnome Software & KDE Discover Signed-off-by: Alexander Wilms <f.alexander.wilms@gmail.com>
2018-07-06build-system/macOS: remove outdated message about errorsGravatar Dirk Hohndel
This hasn't been true for a long time. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-06build-system/macOS: copy one more library when building against Qt5.11Gravatar Dirk Hohndel
I don't quite understand why this one is missing, but otherwise the map doesn't work. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-06build-system/macOS: try both possitble locations for googlemapsGravatar Dirk Hohndel
And don't show an error for the one where it isn't. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-21android/desktop: remove mapWidget from subsurface.qrcGravatar jan Iversen
remove mapWidget entries from subsurface.qrc, and add reference to map-widget.qrc in CMakelist.txt Android uses the same CMakelist.txt Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-18QML UI: update to newer KirigamiGravatar Dirk Hohndel
This seems equally stable to what we have and doesn't appear to introduce any new breakage. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-15mobile: add qmlprefs classGravatar jan Iversen
add class to cmake and pro register class Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09profile: make profile self containedGravatar jan Iversen
move qmlprofile.* to profile dir, to keep all parts of the widget in one place. Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-19Mac: support running Subsurface-mobileGravatar Dirk Hohndel
Copy the required QML modules into the app bundle. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-29cmake: add the GCC_OPTIMIZATION_FLAGS variableGravatar Lubomir I. Ivanov
Instead of always adding -O2 for CMAKE_C_FLAGS_DEBUG and CMAKE_CXX_FLAGS_DEBUG allow the user to pass a custom value via GCC_OPTIMIZATION_FLAGS. Passing -DGCC_OPTIMIZATION_FLAGS:STRING=-O0 would disable all optimizations. Suggested-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2018-04-23Add -libpath argument for qtmacdeployGravatar Allen Hall
Resolves ERROR: no file at "/usr/lib/libgit2.dylib" when building on MacOS. [Dirk Hohndel: SOB in PR #1201 - copying it into the commit for consistenty] Signed-off-by: Allen Hall <revenant83@hotmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-15QML UI: update to latest KirigamiGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-03-11cmake: update CMake to build the map components on mobileGravatar Lubomir I. Ivanov
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2018-02-15Build: do include modules instead of filesGravatar Jan Mulder
Cleanup only. It seems a little weird to first define a CMAKE_MODULE_PATH search path and then explicitly include files including a hard coded path instead of letting the include command search for the modules we like to include. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-10build system: split qt-models into partsGravatar Jan Mulder
For a long time, I did not realize that a lot of qt-models are only used in the mobile app, or only used in the desktop application. This commit splits the qt-models in 3 parts. Used in both mobile and desktop, used in desktop only, used in mobile only. There is no other code change in here, other than cmake changes. To me, this gives at least developers more insight where code is actually used, and there is a small benefit in footpoint. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-03mobile: newer Kirigami SHAGravatar Jan Mulder
This commit consists of the following 3 parts: 1. There are 2 source files added, adapt our build process accordingly. 2. Due to a change in icon and kirigami QML prefixes, we need to adapt for this as well. Changed mobile-resources.qrc for that. When this would not be changed, the icons will not be found. 3. To further prepare for the future, abandon the iconName property in favour of the new icon grouped property, which can have more attributes than only the name. But currently it is only a syntactic change. Tested on Android device, and no visible changes. Signedoff-by: Jan Mulder <jlmulder@xs4all.nl
2017-12-24Fix build for cmake before 3.10Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-24Silence cmake 3.10 warningsGravatar Dirk Hohndel
Explicitly turning of automoc and friends for every single auto generated file seems a rather dumb approach... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-18Compile with -O2 optimization even in debug modeGravatar Berthold Stoeger
The -O0 default is useless owing to extremely convoluted assembly. Moreover, many warnings depending on data analysis are ineffective with -O0. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2017-12-17Turn on -WallGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-05cmake: building Subsurface-mobile without BT is no longer supportedGravatar Dirk Hohndel
It just doesn't seem to make sense. Why would you do that. Allowing this options makes things more complicated as we need to test for that in various places. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-15cmake: make sure to only handle objcopy from MXEGravatar Lubomir I. Ivanov
The native Windows build does not use the MXE tools and call such as `i686-w64-mingw32.shared-objcopy` can fail. Attempt to first find if the program exists using `find_program()` and only then call it. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-15MXE: move the objcopy calls to cmakelists.txtGravatar Lubomir I. Ivanov
The objcopy calls to strip the debug symbols out of subsurface.exe need to happen before the installer is created (staged). Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-04Rename README to README.md in some scripts, makefiles,...Gravatar Stefan Fuchs
Was needed after the file itself was renamed. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-10-23Mac build: use more system librariesGravatar Dirk Hohndel
libxml2, libxslt, and libsqlite3 are new enough on macOS to no longer require our own versions. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-10-20cmake: deal with occasional build order issueGravatar Dirk Hohndel
I only ran into this a couple of times and can't figure out why it picked the order in which it tried to build things - but hard coding the dependency seems to have fixed it (then again, since I didn't always run into this, I'm not sure). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-10-07Typo fix remoev -> removeGravatar Darexon
Signed-off-by: Cameron Phillips <darexon331@gmail.com>
2017-10-06Revert "QML UIL: go back to older Kirigami"Gravatar Dirk Hohndel
This reverts commit 893ff019dbabf356a477da0bdf7d954123759018. Thanks to the amazing support from Marco Martin the theming issue in Kirigami master has been fixed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-10-05QML UIL: go back to older KirigamiGravatar Dirk Hohndel
This brings back correct theming. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-10-04Switch back to latest KirigamiGravatar Dirk Hohndel
And fix the build issue. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-09-17cmake: enable BLE on MacsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-09-04remove Marble from packaging and build scriptsGravatar Lubomir I. Ivanov
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> --- please note, that i have no way to test most of the scripts ATM.
2017-08-26cmake: try to find the Googlemaps plugin on LinuxGravatar Dirk Hohndel
Different flavors of Linux put this in different subdirectories. Just have cmake find the plugin for us. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-08-25Enable googlemaps plugin from build directory on LinuxGravatar Dirk Hohndel
With this change, when running Subsurface from the build directory, it should find a googlemaps plugin that was installed into the install_root. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-08-02Mac build: install googlemaps pluginGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-29Mac install: add missing esri pluginGravatar Dirk Hohndel
Thanks to Lubomir for figuring what was missing! Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-28cmake: install QML components for Subsurface as wellGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-28cmake: only install Marble files when we use MarbleGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-27 05:49:52 +0000