diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-09-02 21:22:29 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-10-30 10:36:48 -0700 |
| commit | 6cd711a11b1a2d9484eb05915de0bd5dc60907b2 (patch) | |
| tree | b53b675a0c54fb5421558b48bec2bcabab5c51d0 /qt-ui | |
| parent | 4c0156e3d51b389db8eccc3fa3da4b8f248f9b13 (diff) | |
| download | subsurface-6cd711a11b1a2d9484eb05915de0bd5dc60907b2.tar.gz | |
Modify code to make it compile after rebase
Did a git rebase and some stuff changed in the meantime;
This is a compatibility commit: Add a few include directories
on the cmake to quiet some ui_headers.h not being found (the
ones that are created automatically by uic) and a few noiseances
like models requiring interface functionality.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qt-ui/CMakeLists.txt b/qt-ui/CMakeLists.txt index a860faed5..45447771a 100644 --- a/qt-ui/CMakeLists.txt +++ b/qt-ui/CMakeLists.txt @@ -8,6 +8,11 @@ if(BTSUPPORT) set(BT_SRC_FILES btdeviceselectiondialog.cpp) endif() +include_directories(. + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} +) + # the interface, in C++ set(SUBSURFACE_INTERFACE updatemanager.cpp |