mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-27 20:58:47 +00:00
Dependencies are too aggressive for version.h
Apparently qmake can't tell that #include "version.h" and #include "libdivecomputer/version.h" are not the same thing. Instead of spending another bunch of hours on fixing the buildsystem I decided to just cleanup the spots where we actually use the version file and rename it to ssrf-version.h. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
22afca58bf
commit
f96299ea94
7 changed files with 5 additions and 7 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -6,7 +6,7 @@ translations/*.qm
|
|||
*.dmg
|
||||
*.patch
|
||||
*.xml
|
||||
version.h
|
||||
ssrf-version.h
|
||||
!dives/*.xml
|
||||
*~
|
||||
po/*.mo
|
||||
|
|
1
main.cpp
1
main.cpp
|
@ -6,7 +6,6 @@
|
|||
#include <time.h>
|
||||
|
||||
#include "qt-gui.h"
|
||||
#include "version.h"
|
||||
#include "subsurfacestartup.h"
|
||||
#include "qt-ui/mainwindow.h"
|
||||
#include "qt-ui/diveplanner.h"
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include "uemis.h"
|
||||
#include "device.h"
|
||||
#include "webservice.h"
|
||||
#include "version.h"
|
||||
#include "libdivecomputer.h"
|
||||
#include "qt-ui/mainwindow.h"
|
||||
#include "helpers.h"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "about.h"
|
||||
#include "version.h"
|
||||
#include "ssrf-version.h"
|
||||
#include <QDebug>
|
||||
#include <QDialogButtonBox>
|
||||
#include <QNetworkReply>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Generate the version.h file
|
||||
VERSION_FILE = version.h
|
||||
# Generate the ssrf-version.h file
|
||||
VERSION_FILE = ssrf-version.h
|
||||
macx: VER_OS = darwin
|
||||
unix: !macx: VER_OS = linux
|
||||
win32: VER_OS = win
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#include "subsurfacestartup.h"
|
||||
#include "ssrf-version.h"
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include "gettext.h"
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
#include "dive.h"
|
||||
#include "divelist.h"
|
||||
#include "libdivecomputer.h"
|
||||
#include "version.h"
|
||||
#include <stdbool.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
Loading…
Reference in a new issue