diff options
| author |  Patrick Valsecchi <patrick@thus.ch> | 2015-02-24 08:49:08 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-24 11:40:54 +0100 |
| commit | e64501574b6d68685082aa478965b11a517b4f48 (patch) | |
| tree | 5802be32bc6196278691f24c7713af59b4526daa /qthelper.cpp | |
| parent | ddc01e39e7486434c6b814358ab4c77ea92c0776 (diff) | |
| download | subsurface-e64501574b6d68685082aa478965b11a517b4f48.tar.gz | |
Fixed cmake build.
Non parallel build was broken because qthelper.cpp was depending
indirectly on a QT generated file and no cmake dependency was enforcing
the file to be generated before. I've removed the not needed #include
that was introducing this dependency.
In cmake, {FOO STREQUAL ""} is TRUE only if FOO is defined and
empty. Fixed a couple of bad usages.
Made the required libraries actually required in cmake.
From ef5ab90f258c5754d3022a023c28050cbafed3d5 Mon Sep 17 00:00:00 2001
From: Patrick Valsecchi <patrick@thus.ch>
Date: Tue, 24 Feb 2015 08:38:49 +0100
Subject: [PATCH 1/2] Fixed cmake build.
Non parallel build was broken because qthelper.cpp was depending
indirectly on a QT generated file and no cmake dependency was enforcing
the file to be generated before. I've removed the not needed #include
that was introducing this dependency.
In cmake, {FOO STREQUAL ""} is TRUE only if FOO is defined and
empty. Fixed a couple of bad usages.
Made the required libraries actually required in cmake.
Signed-off-by: Patrick Valsecchi <patrick@thus.ch>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qthelper.cpp')
| -rw-r--r-- | qthelper.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qthelper.cpp b/qthelper.cpp index 2776290bd..4cedc5597 100644 --- a/qthelper.cpp +++ b/qthelper.cpp @@ -2,7 +2,6 @@ #include "helpers.h" #include "gettextfromc.h" #include "statistics.h" -#include "subsurfacewebservices.h" #include "usersurvey.h" #include "membuffer.h" #include "subsurfacesysinfo.h" |