mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-29 21:50:26 +00:00
Code Issues Projects Releases Packages Wiki Activity
10478 commits 100 branches 97 tags 206 MiB
Commit graph

10478 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dirk Hohndel
88d5fc0fbc Cmake: more use of SUBSURFACE_TARGET and more complete macdepoyqt args 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-17 11:50:41 -08:00
Dirk Hohndel
7c095419f7 Cmake: consistently use SUBSURFACE_TARGET and get the capitalization right 
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-17 11:49:58 -08:00
Tomaz Canabrava
d0b526eda4 Do not try to compile FTDI_EPROM 
this was requiring libconfuse and we don't need it.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-17 11:48:31 -08:00
Tomaz Canabrava
cbe06cca8f Use newer libraries 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-17 11:48:24 -08:00
Tomaz Canabrava
13573915b6 Fix CMake to not add Facebook on Android 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-17 11:48:15 -08:00
Tomaz Canabrava
8abbcc5598 Add the correct target on the Android build 
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-17 11:47:50 -08:00
Tomaz Canabrava
9e39213ed1 Add build* folders on gitignore 
Since we can build for more than one platform at the same time
now, it's userful to block them on the gitignore to make sure
we don't get a dirty tree just because we build for mobile
and desktop inside the subsurface folder.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-17 10:17:57 -08:00
Tomaz Canabrava
92d1dbe3fd Build on android is a shared library 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-17 10:17:51 -08:00
Tomaz Canabrava
9626b8ad84 Simplify IF for OSX handling 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-17 10:17:39 -08:00
Tomaz Canabrava
aa6d9f5ba0 Code cleanup 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-17 10:14:19 -08:00
Tomaz Canabrava
bbc7cbdf75 Remove depreceated calls to -DLIBGIT23 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-17 10:13:39 -08:00
Robert.Helling
e7aba9e362 Unselect source dive when saving a copy in replan 
Then the user can select the two copies and merge them as two different
computers. Without this, the selection could is screwd up and there
is no option to merge in the context menu.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-17 07:38:26 -08:00
Dirk Hohndel
4e69ff54b0 Cmake: fix version generation 
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-16 15:48:31 -08:00
Dirk Hohndel
d4184f852d Cmake: bring back the QtXml hack and other Mac changes 
The hack in commit c8be04edad ("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-16 15:33:30 -08:00
Dirk Hohndel
5672d3f567 Cmake: indentation fix 
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-16 14:27:27 -08:00
Dirk Hohndel
060b5e2189 Cmake: fix install 
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-16 14:25:38 -08:00
Dirk Hohndel
44990671f1 Cmake: correctly read in the enabled translations 
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-16 14:24:47 -08:00
Dirk Hohndel
ec48e9ce5a Cmake: fix QtQuick component designator 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-16 14:03:31 -08:00
Dirk Hohndel
607a601559 Cmake: fix another Mobile/Desktop confusion 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-16 10:41:28 -08:00
Tomaz Canabrava
46ce0704ff Cmake: fix capitalization of Marble 
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-16 10:22:54 -08:00
Dirk Hohndel
a238cd5f3f Cmake: we only want libssrfmarblewidget 
Let's not build against an unmodified Marble anymore.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-16 10:01:07 -08:00
Dirk Hohndel
70b0b3d3f1 Cmake: correctly handle not finding Marble 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-16 09:57:08 -08:00
Dirk Hohndel
23265f31b5 Cmake: fix Application/Executable confusion 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-16 09:48:20 -08:00
Tomaz Canabrava
b8483a1e6c Fixed cached variable 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 09:23:15 -08:00
Tomaz Canabrava
5acfc8c632 Fix targets on mobile and desktop 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 09:23:02 -08:00
Tomaz Canabrava
c3493fa141 Fix some broken-by-design code 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 09:21:28 -08:00
Tomaz Canabrava
27bf6f68f6 Create targets MobileApplication and DesktopApplication 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 09:21:23 -08:00
Tomaz Canabrava
89658cc291 Remove checking the Platform and the App Type, 
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-16 09:21:14 -08:00
Tomaz Canabrava
85946700eb Complain if no Correct App version was passed to be build 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 09:21:07 -08:00
Tomaz Canabrava
9d805bea4a Simplify MXE script 
The MXE script still tried to run things using the qmake project
file and we removed that ages ago.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2015-12-16 09:20:53 -08:00
Tomaz Canabrava
1f960eef74 Accept insourcesubdir builds 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:02:18 -08:00
Tomaz Canabrava
3462da19fd Finish things 
i hope

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:02:16 -08:00
Tomaz Canabrava
6087c246c4 Read the translations from the translations file 
instead of hardcoding everything on the main cmake

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:01:48 -08:00
Tomaz Canabrava
30999a6898 Move run on build dir code out of the main cmake 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:01:48 -08:00
Tomaz Canabrava
cc6875d39e Rework the dependencies on the Android platform 
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-16 08:01:46 -08:00
Tomaz Canabrava
9079701176 Move adding -lpthread 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:01:16 -08:00
Tomaz Canabrava
320cfccd71 Change the way we handle targets 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:57 -08:00
Tomaz Canabrava
47a985b0c7 correct android usage 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:57 -08:00
Tomaz Canabrava
b6eb865803 Issue an error when no platform is found 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:56 -08:00
Tomaz Canabrava
aaafaade5e Use a single variable to handle the extra Qt stuff 
It's easier to debug what's wrong this way

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:31 -08:00
Tomaz Canabrava
24f0abe347 Remove commented out code 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:31 -08:00
Tomaz Canabrava
32714faf24 Remove the Dll finding code from within the Main CMake 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:31 -08:00
Tomaz Canabrava
c7a3cb68f5 We don't need the same test twice for the same thing. 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:31 -08:00
Tomaz Canabrava
4ae0ce0c60 Code Cleanup 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:31 -08:00
Tomaz Canabrava
b33059e08b We don't support insource builds anymore 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:31 -08:00
Tomaz Canabrava
6948859678 Move include directories a bit down below 
Better to follow the CMake logic and se those near the
sources

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:31 -08:00
Tomaz Canabrava
957f5532b8 Move OSX code to OSX IF 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:30 -08:00
Tomaz Canabrava
2637b5c3f1 Rework Options order, add SUBSURFACE_TARGET_PLATFORM flag. 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 08:00:04 -08:00
Tomaz Canabrava
f26df4f80a Move Handling of user manual to Modules directory 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
 2015-12-16 07:59:37 -08:00
Tomaz Canabrava
268fbf3fb1 Handle VersionGeneration outside of the main CMakeFile 
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-16 07:59:37 -08:00