Merge remote branch 'jblum/cmake_fixes' into next

3 files changed, 2 insertions, 37 deletions

diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt
index 3290b1e77..ab6fedcf8 100644
--- a/gr-qtgui/lib/CMakeLists.txt
+++ b/gr-qtgui/lib/CMakeLists.txt
@@ -105,9 +105,9 @@ install(FILES
     WaterfallDisplayPlot.h
     waterfallGlobalData.h
     ConstellationDisplayPlot.h
-    highResTimeFunctions.h
     plot_waterfall.h
     spectrumdisplayform.h
+    timedisplayform.h
     SpectrumGUIClass.h
     spectrumUpdateEvents.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio
diff --git a/gr-qtgui/lib/highResTimeFunctions.h b/gr-qtgui/lib/highResTimeFunctions.h
deleted file mode 100644
index 6b3844901..000000000
--- a/gr-qtgui/lib/highResTimeFunctions.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2011 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef HIGH_RES_TIME_FUNCTIONS_H
-#define HIGH_RES_TIME_FUNCTIONS_H
-
-#include <gruel/high_res_timer.h>
-
-typedef gruel::high_res_timer_type highres_timespec;
-
-static inline highres_timespec
-get_highres_clock()
-{
-  return gruel::high_res_timer_now();
-}
-
-#endif /* HIGH_RES_TIME_FUNCTIONS_H */
diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index 234af5a68..34b40fb7e 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -40,6 +40,7 @@ GR_SWIG_INSTALL(
 )
 
 install(FILES
+    qtgui_swig.i
     qtgui_sink_c.i
     qtgui_sink_f.i
     qtgui_time_sink_c.i