aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)Author
2015-12-16Fix targets on mobile and desktopGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Fix some broken-by-design codeGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Create targets MobileApplication and DesktopApplicationGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Remove checking the Platform and the App Type,Gravatar Tomaz Canabrava
The check must be done, but not on the way I tried to do. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Complain if no Correct App version was passed to be buildGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Finish thingsGravatar Tomaz Canabrava
i hope Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Read the translations from the translations fileGravatar Tomaz Canabrava
instead of hardcoding everything on the main cmake 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-16Rework the dependencies on the Android platformGravatar Tomaz Canabrava
We where able to build the android-mobile on desktop and the desktop on android, now I allow only mobile on android and desktop on desktop. this is to make the cmake clear, and we can also use the emulator on the android platform, so nothing is really lost. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move adding -lpthreadGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Change the way we handle targetsGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16correct android usageGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Issue an error when no platform is foundGravatar 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 commented out codeGravatar Tomaz Canabrava
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-16We don't need the same test twice for the same thing.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Code CleanupGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16We don't support insource builds anymoreGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move include directories a bit down belowGravatar Tomaz Canabrava
Better to follow the CMake logic and se those near the sources Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move OSX code to OSX IFGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Rework Options order, add SUBSURFACE_TARGET_PLATFORM flag.Gravatar 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-16Add some commits to make cmake clearGravatar Tomaz Canabrava
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-12-15Cmake: remove debug code that accidentially slipped inGravatar Dirk Hohndel
And try to fix the upper case / mixed case confusion that we apparently have with libssh2 - oh how I hate this stuff. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-15Remove support for older libgit2 - we now require 0.23 or laterGravatar Dirk Hohndel
Also fixes a capitalization error that prevented finding libssh2 in some circumstances. And adds a missing include when building with libzip on Mac. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-09Mac build: move the QtXml hack into CmakeGravatar Dirk Hohndel
This way build.sh can build a Subsurface.app that the user can use via open subsurface/build/Subsurface.app after running build.sh. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-06Only install QML Framework files for Subsurface-mobileGravatar Dirk Hohndel
The workaround to building Subsurface-mobile on Mac messes with the ability to sign the bundle, so only do this when building Subsurface-mobile which we don't bundle, anyway. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-02Fix disabling of facebook integrationGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-02Remove defaults for Android from cmakeGravatar Anton Lundin
Some of the flags needed to build for android was set in cmake. There are many more that needs to be set correctly for things to work, so having some in cmake and some in the Android build.sh is just confusing. This removes the bits from cmake and moves everything into build.sh. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-30CMake hack to build Subsurface-mobile on MacGravatar Dirk Hohndel
With this running make && make install should give you a Subsurface-mobile.app that you can execute (either with double click or using "open Subsurface-mobile.app" from the command line). This contains a couple of hacks but I didn't try too hard to make this clean since Tomaz is redoing the CMake build system, anyway and I'll need to make sure this still works once he's done. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-24Cmake: fix building of Subsurface-mobile on MacGravatar Dirk Hohndel
The error message was completely useless, but it turned out to be an issue of the order of arguments to add_executable(). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-18Location service: move into subsurface-coreGravatar Dirk Hohndel
While this is primarily something targeted at a mobile device, with many of the 2 in 1 devices it is possible that the user might be running the desktop version of Subsurface on a mobile device. As a first step to make it possible to collect GPS fixes on such a device we need to make the infrastructure to do so available in the desktop application as well. This still needs to be hooked up in the desktop UI. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-18Cmake: add SUBSURFACE_MOBILE definition earlierGravatar Dirk Hohndel
This way it is set when subsurface-core is built. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-12SmartTrak import - Add build capability to cmakeGravatar Salvador Cuñat
This enables posibility of building standalone import tool via cmake. Adds an option SMARTRAK_IMPORT (defaults to OFF) which, if turned ON, will require glib-2.0 and libmdb libraries to be installed, and, calling will produce an executable with the highly original name of smtk2ssrf. I have no capability to cross-compile to windows, so I haven't even tried to put this in Win, less say in Mac. I expect linux users which may be actual users of SmartTrak, to test this before trying to build on windows, although the target public will probably be the windows users (or at least, ex windows user). Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-11Location service: move files around to fit new directory layoutGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-11Location service: Add GPS location infrastructure for Subsurface-mobileGravatar Dirk Hohndel
This doesn't do a thing - just adds the empty class and sets up the Cmake file so it finds the required Qt components for Subsurface-mobile. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-10Enable BT compilation earlierGravatar Miika Turkia
Commit ba55c603953bb530de2fe97fa46098d8c87e6aa5 broke Bluetooth support for me. This patch moves the setting of BT_SUPPORT earlier, re-enabling BT download option on the download dialog. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-09Don't rely on CMAKE_AUTOUICGravatar Tomaz Canabrava
Some old CMakes that we use had problems with it, change to use the qt5_wrap_ui macro that's bundled with Qt. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-09Remove Facebook from PluginsGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-08Removed C++11 from the code.Gravatar Tomaz Canabrava
Make Dirk ungrumpy Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-08Revert "Mac: don't use C++11 on older clang versions"Gravatar Dirk Hohndel
This reverts commit acb74f25f7e6d26df7f39f596510ee2d5226fb15. Better not enable it anywhere
2015-11-08Make building plugins optionalGravatar Dirk Hohndel
This currently fails at least on my old Mac that I use to create binaries that work on 10.7 and newer. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-08Mac: don't use C++11 on older clang versionsGravatar 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-28 11:32:02 +0000