Good evening. Two patches to make work again the SMARTTRAK_IMPORT=ON option on cmake.
The first one is a bit old, but it didn't make into master in time. The second is necessary after April changes in source tree. Regards.
From b43b1337d89030cf6a4af66a21c35e7a787f32c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Cu=C3=B1at?= <[email protected]> Date: Fri, 13 Nov 2015 19:16:11 +0100 Subject: [PATCH] SmartTrak import - Add building out of source tree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enables auto uic in smtk-import directory and sets CMAKE_INCLUDE_CURRENT_DIR to ON Signed-off-by: Salvador Cuñat <[email protected]> --- smtk-import/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/smtk-import/CMakeLists.txt b/smtk-import/CMakeLists.txt index 93fbb84..c49eeac 100644 --- a/smtk-import/CMakeLists.txt +++ b/smtk-import/CMakeLists.txt @@ -1,10 +1,12 @@ +set(CMAKE_AUTOUIC ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SMTK_IMPORT_SRCS smartrak.c smrtk2ssrfc_window.ui smrtk2ssrfc_window.h smrtk2ssrfc_window.cpp ) -source_group("SmartTrak Import libs" FILES ${SMTK_IMPORT_SRCS}) +source_group("SmartTrak Import libs" FILES ${SMTK_IMPORT_SRCS}) add_library(smtk_import STATIC ${SMTK_IMPORT_SRCS}) target_link_libraries(smtk_import subsurface_corelib ${SUBSURFACE_LINK_LIBRARIES}) -- 2.6.2
From e07a4dc99bce7188f42b00311a58555dbc90bd95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Cu=C3=B1at?= <[email protected]> Date: Wed, 15 Jun 2016 20:59:34 +0200 Subject: [PATCH] [Smartrak-import] Locate included header files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After commit 7be962b some directories changed their names. Signed-off-by: Salvador Cuñat <[email protected]> --- smtk-import/smartrak.c | 12 ++++++------ smtk-import/smrtk2ssrfc_window.cpp | 6 +++--- smtk-import/smtk_standalone.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/smtk-import/smartrak.c b/smtk-import/smartrak.c index 9d3ac50..b3407e3 100644 --- a/smtk-import/smartrak.c +++ b/smtk-import/smartrak.c @@ -28,12 +28,12 @@ #include <mdbtools.h> #include <stdarg.h> -#include "dive.h" -#include "gettext.h" -#include "divelist.h" -#include "libdivecomputer.h" -#include "divesite.h" -#include "membuffer.h" +#include "core/dive.h" +#include "core/gettext.h" +#include "core/divelist.h" +#include "core/libdivecomputer.h" +#include "core/divesite.h" +#include "core/membuffer.h" /* SmartTrak version, constant for every single file */ int smtk_version; diff --git a/smtk-import/smrtk2ssrfc_window.cpp b/smtk-import/smrtk2ssrfc_window.cpp index cb332cd..385dad8 100644 --- a/smtk-import/smrtk2ssrfc_window.cpp +++ b/smtk-import/smrtk2ssrfc_window.cpp @@ -1,8 +1,8 @@ #include "smrtk2ssrfc_window.h" #include "ui_smrtk2ssrfc_window.h" -#include "filtermodels.h" -#include "dive.h" -#include "divelist.h" +#include "qt-models/filtermodels.h" +#include "core/dive.h" +#include "core/divelist.h" #include <QFileDialog> #include <QFileInfo> #include <QSettings> diff --git a/smtk-import/smtk_standalone.cpp b/smtk-import/smtk_standalone.cpp index 54d5b6a..3abbcd7 100644 --- a/smtk-import/smtk_standalone.cpp +++ b/smtk-import/smtk_standalone.cpp @@ -1,6 +1,6 @@ #include <stdlib.h> #include <stdio.h> -#include "dive.h" +#include "core/dive.h" #include "smrtk2ssrfc_window.h" #include <QApplication> #include <QDebug> -- 2.8.1
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
