diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-19 15:55:52 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-19 15:55:52 +0200 |
| commit | 7153a0b4daa30cef7d6e721e7b2edc511a1adf71 (patch) | |
| tree | 64fbecfaf11d4fb03064b96030229d5130611e3b | |
| parent | 136151e9499ac8f2f7ec1a169a973d65b15820bb (diff) | |
unbreak build
Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>
Reported-by: mm0zct
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | FTNoIR_Tracker_PT/ftnoir_tracker_pt.h | 2 | ||||
| -rw-r--r-- | ftnoir_tracker_aruco/ftnoir_tracker_aruco.h | 2 | ||||
| -rw-r--r-- | ftnoir_tracker_ht/ftnoir_tracker_ht.h | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index adf692af..f875665f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ project(opentrack) cmake_minimum_required(VERSION 2.8) -cmake_policy(SET CMP0020 NEW) + +if(NOT CMAKE_VERSION LESS "2.10.0") + cmake_policy(SET CMP0020 NEW) +endif() set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/cmake/") SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h index e00ab1df..64f282b6 100644 --- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h +++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h @@ -38,7 +38,7 @@ class Tracker : public ITracker, QThread, public FrameProvider {
public:
Tracker();
- virtual ~Tracker() override;
+ virtual ~Tracker();
// --- ITracker interface ---
virtual void Initialize(QFrame *videoframe);
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h index ec4c6c9d..815ca91c 100644 --- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h +++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h @@ -24,7 +24,7 @@ class Tracker : public QThread, public ITracker Q_OBJECT public: Tracker(); - virtual ~Tracker() override; + virtual ~Tracker(); void StartTracker(QFrame* frame); bool GiveHeadPoseData(double *data); bool enableTX, enableTY, enableTZ, enableRX, enableRY, enableRZ; diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h index 20648c51..bde4ca67 100644 --- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h +++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h @@ -22,7 +22,7 @@ class Tracker : public QObject, public ITracker Q_OBJECT public: Tracker(); - virtual ~Tracker() override; + virtual ~Tracker(); void StartTracker(QFrame* frame); bool GiveHeadPoseData(double *data); bool enableTX, enableTY, enableTZ, enableRX, enableRY, enableRZ; |