aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/Modules
AgeCommit message (Collapse)Author
2017-05-12Update Subsurface-mobile versionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-24Update Subsurface-mobile version to 1.2.1Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-25Fix dlllist.cmake not to use hard coded path to link.txtGravatar Jeremie Guichard
The utility could be used for other targets, path should therefore depend on the inputted target parameter Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-25Move CMake variables printing into a utility macroGravatar Jeremie Guichard
Added cmake_variables_helper.cmake providing 2 helpers - print_variable - print_all_variables Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-01-21Update Subsurface-mobile versionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-16build.sh: if new enough libgit2 is installed, use itGravatar Dirk Hohndel
Right now this is only designed for Linux where current distros all should have a new enough libgit2 (and our instructions tell people to install this with system tools, so we should also use it). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-12-30Start transition from QWebKit to QWebEngineGravatar Robert C. Helling
This removes all references to WebKit if cmake option USE_WEBKIT is enabled. For the user manual it changes it to WebEngine (seems to work for me). Similar for the Facebook connection (minus a reference to a cookie jar). This I could not test at the moment, as I wrote this on a train. Printing does not work, it is a null operation at the moment. Currently, large parts of of the printing code are commented out as there is no direct way to access page elements in WebEngine. It seems this needs to be done via Javascript (with a callback invoked). There is new functionality in WebEngine to render a view to a PDF file but this needs more work (and probably some thoughts towards page breaks). Signed-off-by: Robert C. Helling <helling@atdotde.de>
2016-09-17Bump mobile versionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-09-04Update Subsurface-mobile version to 1.1.0Gravatar Dirk Hohndel
Just so that the iOS release has a sane starting point - and frankly, we've done a very poor job of maintaining this version number. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-01QML UI: all these changes certainly deserve a new versionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-28Update mobile versionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-13Bump Subsurface-mobile versionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-11Another bump to the Subsurface-mobile version numberGravatar Dirk Hohndel
Hopefully this is the one we can release. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-10Bump Subsurface-mobile versionGravatar Dirk Hohndel
Even though 1.0.0 was never released publicly, it was offered to beta testers, so it is good practice to bump the version number for the next binary that I'll push to them. Even if the build number would of course be different. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-10Update Subsurface-mobile version to 1.0.0Gravatar Dirk Hohndel
And make sure the version displayed for Android includes both that version and the build version, which is our regular canonical 4 part version number - so this release will be something like "1.0.0 (4.5.2.1047)" Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-09Fix cmake for libssh2 1.7 and laterGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-05Introduce separate version number for Subsurface-mobileGravatar Dirk Hohndel
This is hard coded in version.cmake for now. The intent is to go to 1.0 in the first release version and to increment from there whenever we create an update. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08Force the creation of some soft-linksGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20Remove the non-canonical Subusrface versionGravatar Dirk Hohndel
It no longer makes sense to lie about the version. If you are running a product build, then the canonical version is the same version as the plain version used to be. And in either case it makes much more sense to simply log the full version information. We used to have the differently styled versions for different OSs, but I don't think this is needed anymore. Let's hope this doesn't go down as one of these "famous last words" moments... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-19Trying to fix persistent build problemsGravatar Dirk Hohndel
This shouldn't hurt on any platform, but it may help on a couple of platforms where it appears we are missing libcrypto on the link line. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Cmake: successfully create the subsurface.nsi fileGravatar Dirk Hohndel
More issues with the static cmake files. Again we were missing a variable and needed less quoting. Additionally there was dead / redundant code. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Cmake: adjust dlllist.cmake to no longer be created on the flyGravatar Dirk Hohndel
Because of this a bunch of variables need to be passed in and the quoting changes in rather subtle ways. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Cmake: fix variable name case confusionGravatar Dirk Hohndel
I don't know why on one of my Macs (running El Capitan, XCode 7.2, cmake 3.4.1) I get Libssh2_FOUND instead of LIBSSH2_FOUND, but this hack works around the problem. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Code cleanupGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Remove depreceated calls to -DLIBGIT23Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix version generationGravatar Dirk Hohndel
In the cmake module we no longer had a way to get back to the main scripts directory. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix capitalization of MarbleGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: we only want libssrfmarblewidgetGravatar Dirk Hohndel
Let's not build against an unmodified Marble anymore. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: correctly handle not finding MarbleGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Accept insourcesubdir buildsGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move run on build dir code out of the main cmakeGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Use a single variable to handle the extra Qt stuffGravatar Tomaz Canabrava
It's easier to debug what's wrong this way Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Remove the Dll finding code from within the Main CMakeGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move Handling of user manual to Modules directoryGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Handle VersionGeneration outside of the main CMakeFileGravatar Tomaz Canabrava
This is actually a good change: we used to write a new CMake file in configure time just to move it outside of the source to the build dir at compile time. Now this file is pre-created and it's only moved. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move FTDI and Grantlee configuration out of CMakeLists.txtGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Add HandleFindMarble.cmakeGravatar Tomaz Canabrava
Marble stuff should be inside handleMarble file, this clears the Main CMakelists.txt file. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Added HandleFindLibDiveComputer.cmakeGravatar Tomaz Canabrava
Anoter attempt to clear the Main CMakeLists.txt file Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Ensure Out of Source buildsGravatar Tomaz Canabrava
In source builds creates a lot of noise on the source tree, creating tons of temporaries that makes git status cry, and it also creates dangerous files that have names similar to actual source and could make a developer use them by mistake. Make out of source buiild mandatory to remove that, it also makes CMake code easier to read. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Start to clean the Main CMakeLists.txt filelGravatar Tomaz Canabrava
CMake is a strange and complex language for buildsystems, and as such we need to let the main CMakeLists.txt be as clear as possible. Moving a bunch of code that deals with finding git via default CMake way or pkg_cofig to a file named 'HandleFindGit' on our cmake/Modules folder. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-10-09Make the mac bundle be a high resolution appGravatar Dirk Hohndel
This way it no longer gets started in the ugly low resolution emulation mode. What a difference. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-10cmake: allow looking for optional librariesGravatar Dirk Hohndel
And use this to look for libusb. If it's there then libdivecomputer likely was linked against it. If it isn't then we don't need it, either. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-09build.sh: use "install-root" for our local install destinationGravatar Dirk Hohndel
This seems less confusing then calling it just "install". Also adjust our cmake/Modules/Find... files accordingly. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-07Make it compilant with the build scriptGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-07Add FindLibdivecomputer.cmakeGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-07Add a FindLIBGIT2 based on our FindMarble.Gravatar Tomaz Canabrava
It currently searches for the .a (preferred) or the .so in the following directories, in order: ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2, /usr/local, and /usr. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-07Search for Marble in the default build folderGravatar Tomaz Canabrava
Now we search for Marble in the default build folder, too, which is CMAKE_CURRENT_SOURCE_DIR/.. Also look for both regular Marble and for our Subsurface branch of Marble (which uses a different library name). Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-07Move the pkg_config_library macro to its own fileGravatar Tomaz Canabrava
The pkg_config_library macro is a helper macro and was generating noise on the main CMakeLists.txt file, so I moved it to another file. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-07FindMarble moved to cmake/ModulesGravatar Tomaz Canabrava
This is the correct way to deal with CMake Modules (or at least, the default way). All our custom CMakeFiles will be here. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-26 18:31:21 +0000