aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)Author
2015-12-19Cmake: don't use wildcards when deleting debug componentsGravatar Dirk Hohndel
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: more use of SUBSURFACE_TARGET and more complete macdepoyqt argsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Cmake: consistently use SUBSURFACE_TARGET and get the capitalization rightGravatar Dirk Hohndel
Also clean up a bit of the whitespace mess right where I'm making changes Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Fix CMake to not add Facebook on AndroidGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Add the correct target on the Android buildGravatar Tomaz Canabrava
The android build could be the Desktop and the Mobile app, we cannot force it to be the mobile. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Build on android is a shared libraryGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Simplify IF for OSX handlingGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: bring back the QtXml hack and other Mac changesGravatar Dirk Hohndel
The hack in commit c8be04edad5e ("Mac build: move the QtXml hack into Cmake") had been lost in the latest cmake rewrite. Similarly, the modified BUNDLE info and the manual QML deployment. Strangely this still doesn't correctly create a Subsurface-mobile.app on Mac. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: indentation fixGravatar Dirk Hohndel
I split this out as separate commit so that the previous commit becomes easier to read. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix installGravatar Dirk Hohndel
This had not been updated since the change of direction that we would support building Mobile and Desktop on all supported platforms. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: correctly read in the enabled translationsGravatar Dirk Hohndel
FILE READ doesn't do what we want. It's the STRINGS command that considers \n as whitespace and gets the correct result. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix QtQuick component designatorGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix another Mobile/Desktop confusionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix Application/Executable confusionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Fixed cached variableGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
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>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-29 02:24:01 +0000