summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)Author
2020-10-30build-system: first steps towards a 64bit Windows buildGravatar Dirk Hohndel
This is barely scratching the surface (no put intended), and of course the container needs to be updated, first, to have a 64bit version of MXE installed, but this seems to help make libmtp build correctly. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-10-30add initial support for the Garmin Descent Mk2iGravatar Dirk Hohndel
This brings in the needed libdivecomputer updates and builds Subsurface against libmtp in order to support downloading dive data via MTP (since the Mk2/Mk2i no longer provide a FAT filesystem via USB). In order for this to work you need to have libmtp installed on your system. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-10-24build-system: switch to using C++17 as default C++ dialectGravatar Berthold Stoeger
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-10-23cleanup: remove outdated explicit libssh2 linkGravatar Dirk Hohndel
We used to need this when building our own libgit2 on older distibutions. This shouldn't be needed anymore at all. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-10-16build-system/macOS: remove Qt SQL plugins and suppress some errorsGravatar Dirk Hohndel
Technically with this the app might be ready for AppStore inclusion. I don't see myself spending the energy on that, TBH. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-10-11Set the NO_PRINTING variable properlyGravatar Robert C. Helling
Signed-off-by: Robert C. Helling <helling@atdotde.de>
2020-10-08build-system: remove building Grantlee cmakeGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-09-19core/bluetooth: switch to use libdivecomputer rfcomm supportGravatar Linus Torvalds
The Qt based implementation apparently got broken at some point and now fails to connect to rfcomm dive computers like the Shearwater Petrel. This uses the libdivecomputer rfcomm backend. Tested to work with bluez on Linux as well as with the native Windows implementation. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-09-13build-system/macOS: add one more library that macdeployqt missesGravatar Dirk Hohndel
This appears to be new with Qt 5.14. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-05-09add Berthold to the list of explicitly mentioned developersGravatar Dirk Hohndel
Number 3 overall committer with currently 9% of total commits and 27% of all commits in the last three years. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-04-25build-system/android: remove libusb at QTestGravatar Dirk Hohndel
We no longer use libusb to access USB devices on Android, therefore there's no point including libusb in our build. Also, we have never even attempted to run the tests on Android, so let's not even pretend to support building them. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-04-25build-system/Android: don't bundle the user manualGravatar Dirk Hohndel
That wouldn't work, anyway. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-10build-system: remove pointless distinction between desktop and mobileGravatar Dirk Hohndel
It's the same sources, the same library. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-09mobile/undo: compile undo commands and call undo command for deletion.Gravatar Berthold Stoeger
First steps towards full undo on mobile. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-24build-system: move exportfuncs to backend-sharedGravatar jan Iversen
WARNING: multi directory commit, needed to secure it builds. move the core/exportfuncs.* to backend-shared. update backend-shared/CMakeLists.txt to generate backend-shared lib update CMakeLists.txt to include backend-shared lib in link process. update ios project to reflect new directory Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-24build-system: add new root dir backend-sharedGravatar jan Iversen
WARNING: multi directory commit, needed to secure it builds. leaving the shared backend sources in core, imposes a severe limitation, that they cannot make use of e.g. qt-models, because that is created after core (first library to be created). The shared backend uses functionality from core and qt-models, so it must be created when those are available and before desktop-widgets or mobile-widgets are created. Make a new root directory "backend-shared" with empty CMakeLists.txt Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-24build-system: Add CMakeLists.txt to mobile-widgetsGravatar jan Iversen
In order to make the central CMakeLists cleaner and more consistent add a CMakeLists.txt to mobile-widgets, like in other root directories. Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-24build-system: Add CMakeLists.txt to map-widgetGravatar jan Iversen
In order to make the central CMakeLists cleaner and more consistent add a CMakeLists.txt to map-widget, like in other root directories. Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-24build-system: move qmlprofile to profile-widgets/CMakeLists.txtGravatar jan Iversen
qmlprofile.* is part of profile-widget, and are now defined in the the corresponding CMakeLists.txt, and thereby making the central CMakeLists.txt cleaner. Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-10build-system: avoid stripping executable on Mac.Gravatar jan Iversen
Add -no-strip to macdeployqt, to ensure the executable contains debug symbols Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-11-26build-system: add CMake SUBSURFACE_MOBILE_DESKTOP as new build typeGravatar jan Iversen
Add -DSUBSURFACE_MOBILE_DESKTOP to CMake, allowing the C++ part to be different when compiling for a device or for the desktop. Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-11-14Refactoring: move undo commands to top levelGravatar Berthold Stoeger
In the future we might want to use undo-commands for mobile as well (even if not implementing undo). Therefore, move the undo-command source from desktop-widgets to their own commands top-level folder. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-11-14/: Corrected wrong Qt dependency from KirigamiGravatar jan Iversen
Kirigami 5.62 uses QtQuick.Controls 2.5, which were introduced in Qt 5.12 (see https://doc.qt.io/qt-5/qtquickcontrols-index.html) update CMakeList.txt to demand min. 5.12 when building SUBSURFACE-MOBILE update INSTALL text Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-10-16GitHub Actions: add Linux Qt 5.12 container buildGravatar Dirk Hohndel
The AppImage works - I just need to figure out how to post releases. For now it'a available on the Actions page as Artifact. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-14build-system: Subsurface-mobile now requires Qt 5.11Gravatar Dirk Hohndel
This is one of the side effects of switching to Kirigami 5.62 - but since we build our mobile versions with Qt 5.12 and Qt 5.13, this really isn't an issue. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-14build-system: require Qt 5.9.1 or newerGravatar Dirk Hohndel
With this all BT platforms now support BLE Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-13Mobile: update Kirigami to v5.62Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-02build-system: add option to enable profilingGravatar Dirk Hohndel
Simply nice to have - even though it didn't help me track down the issue this time around. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-09-21Android: bundle default font for use in OnePlus devicesGravatar Dirk Hohndel
This is working around a Qt Bug https://bugreports.qt.io/browse/QTBUG-69494 which prevents correct rendering of the OnePlus fonts. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-04-12CMake: move enable_testing() to the top levelGravatar Rolf Eike Beer
This allows calling ctest from the main build directory instead of having to change one level down. As a bonus the unittests now show up in my KDevelop so I can directly run them from the IDE. Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-27drop support for Qt 5.4 and beforeGravatar Rolf Eike Beer
The oldest version tested on TravisCI is Qt 5.5, which is also what is in Ubuntu 16.04. Drop all the older cruft, noone should use that anymore. Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-20Remove partial support for QWebEngineGravatar Dirk Hohndel
Printing never worked, none of this was ever included in test builds. Also, now that there are official releases of QtWebKit again, this just doesn't seem worth carrying along anymore. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-03-19CMake: call cmake_minimim_required() before project()Gravatar Rolf Eike Beer
Some policies can affect how project() works. Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-19CMake: let CMake set the needed flags for C and C++ standardsGravatar Rolf Eike Beer
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-16build-system: explicitly add libgit2 dependencies for LGTMGravatar Dirk Hohndel
For some reason on LGTM these two libraries aren't automatically added to the link line for Subsurface. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-03-09CMake: get rid of QT_EXTRA_LIBRARIESGravatar Rolf Eike Beer
This can be easily derived from QT_EXTRA_COMPONENTS. Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-05CMake: simplify writing qt.conf on WindowsGravatar Rolf Eike Beer
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-05CMake: tell the Intel compiler to use the correct C/C++ standardsGravatar Rolf Eike Beer
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-05CMake: do not expand variables in if-expressionsGravatar Rolf Eike Beer
CMake will do the expansion internally itself. Not doing it here is not only less code, it also makes sure one does not accidentially get a double expansion. Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-05CMake: simplify checking if policy can be setGravatar Rolf Eike Beer
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-05Add support to compile from source on a Raspberry PiGravatar Doug Junkins
Update CMakeLists.txt to test if the CMAKE_SYSTEM_PROCESSOR variable is either armv6l or armv7l. If so, add libGLESv2 to the list of libraries to be linked to support openGL on embedded systems. Update INSTALL file to list the packages needed to be installed on Raspian Stretch or Ubuntu Mate to successfully compile subsurface from source. Signed-off-by: Doug Junkins <junkins@foghead.com>
2019-02-01facebook: remove the featute from the code baseGravatar Lubomir I. Ivanov
Remove from: - unit tests - desktop widgets - preferences - core intergration - cmakefiles - build scripts - icons - docs Also remove the plugins and social network integration. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2018-12-06Android build: buildtools version is automatically detectedGravatar Jan Mulder
With commit 0d8fc7ef970e of qt-android-cmake, the buildtools version is automatically detected. So do not try to pass it any more, as this breaks the build. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-11-14MXE: add missing Qt5PositioningQuick.dllGravatar Dirk Hohndel
Without this the map won't load. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-11-13Android: find Qt cmake modulesGravatar Dirk Hohndel
With a recent change to the qt-android-cmake project we are now using the toolchain file bundled with the NDK, and that forces all cmake modules to be part of the NDK tree - which breaks the way we find our Qt installation. This is a hack to work around this as it undoes this setting, which I'm sure is well intentioned to prevent host system issues in this cross build scenario. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-10-28std99 does not make sense for C++Gravatar Robert C. Helling
... and makes Qt Creator fail to parse files. Signed-off-by: Robert C. Helling <helling@atdotde.de>
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>