Repaired cmake buildsystem - include files paths were inconsistent with source files after changing directory structure

CMakeLists.txt

@@ -70,6 +70,10 @@ include(GrPlatform) #define LIB_SUFFIX
 set(GR_RUNTIME_DIR      bin)
 set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
 set(GR_INCLUDE_DIR      include/gsm)
+set(GR_INCLUDE_DIR      include/gsm/misc_utils)
+set(GR_INCLUDE_DIR      include/gsm/receiver)
+set(GR_INCLUDE_DIR      include/gsm/demapping)
+set(GR_INCLUDE_DIR      include/gsm/decoding)
 set(GR_DATA_DIR         share)
 set(GR_PKG_DATA_DIR     ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
 set(GR_DOC_DIR          ${GR_DATA_DIR}/doc)

include/gsm/CMakeLists.txt

@@ -20,15 +20,12 @@
 ########################################################################
 # Install public header files
 ########################################################################
+add_subdirectory(misc_utils)
+add_subdirectory(decoding)
+add_subdirectory(demapping)
+add_subdirectory(receiver)
+
 install(FILES
     api.h
-    receiver/receiver.h
-    misc_utils/bursts_printer.h
-    demapping/get_bcch_or_ccch_bursts.h
-    decoding/control_channels_decoder.h 
-    gsmtap.h
-    misc_utils/extract_system_info.h
-    misc_utils/controlled_rotator_cc.h
-    misc_utils/controlled_const_source_f.h
-    misc_utils/message_printer.h DESTINATION include/gsm
+    gsmtap.h DESTINATION include/gsm
 )

include/gsm/decoding/CMakeLists.txt

@@ -0,0 +1,25 @@
+# Copyright 2011,2012 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.
+
+########################################################################
+# Install public header files
+########################################################################
+install(FILES
+    control_channels_decoder.h DESTINATION include/gsm/decoding
+)

include/gsm/demapping/CMakeLists.txt

@@ -0,0 +1,25 @@
+# Copyright 2011,2012 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.
+
+########################################################################
+# Install public header files
+########################################################################
+install(FILES
+    get_bcch_or_ccch_bursts.h DESTINATION include/gsm/demapping
+)

include/gsm/misc_utils/CMakeLists.txt

@@ -0,0 +1,29 @@
+# Copyright 2011,2012 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.
+
+########################################################################
+# Install public header files
+########################################################################
+install(FILES
+    bursts_printer.h
+    extract_system_info.h
+    controlled_rotator_cc.h
+    controlled_const_source_f.h
+    message_printer.h DESTINATION include/gsm/misc_utils
+)

include/gsm/misc_utils/wireshark_sink.h

@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/* 
+ * Copyright 2014 <+YOU OR YOUR COMPANY+>.
+ * 
+ * This 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.
+ * 
+ * This software 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 this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+#ifndef INCLUDED_GSM_WIRESHARK_SINK_H
+#define INCLUDED_GSM_WIRESHARK_SINK_H
+
+#include <gsm/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+  namespace gsm {
+
+    /*!
+     * \brief <+description of block+>
+     * \ingroup gsm
+     *
+     */
+    class GSM_API wireshark_sink : virtual public gr::block
+    {
+     public:
+      typedef boost::shared_ptr<wireshark_sink> sptr;
+
+      /*!
+       * \brief Return a shared_ptr to a new instance of gsm::wireshark_sink.
+       *
+       * To avoid accidental use of raw pointers, gsm::wireshark_sink's
+       * constructor is in a private implementation
+       * class. gsm::wireshark_sink::make is the public interface for
+       * creating new instances.
+       */
+      static sptr make();
+    };
+
+  } // namespace gsm
+} // namespace gr
+
+#endif /* INCLUDED_GSM_WIRESHARK_SINK_H */
+

include/gsm/receiver/CMakeLists.txt

@@ -0,0 +1,25 @@
+# Copyright 2011,2012 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.
+
+########################################################################
+# Install public header files
+########################################################################
+install(FILES
+    receiver.h DESTINATION include/gsm/receiver
+)

lib/decoding/control_channels_decoder_impl.h

@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_CONTROL_CHANNELS_DECODER_IMPL_H
 #define INCLUDED_GSM_CONTROL_CHANNELS_DECODER_IMPL_H
 
-#include <gsm/control_channels_decoder.h>
+#include <gsm/decoding/control_channels_decoder.h>
 #include "fire_crc.h"
 #include "cch.h"
 

lib/demapping/get_bcch_or_ccch_bursts_impl.h

@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_GET_BCCH_OR_CCCH_BURSTS_IMPL_H
 #define INCLUDED_GSM_GET_BCCH_OR_CCCH_BURSTS_IMPL_H
 
-#include <gsm/get_bcch_or_ccch_bursts.h>
+#include <gsm/demapping/get_bcch_or_ccch_bursts.h>
 
 namespace gr {
   namespace gsm {

lib/misc_utils/bursts_printer_impl.h

@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_BURSTS_PRINTER_IMPL_H
 #define INCLUDED_GSM_BURSTS_PRINTER_IMPL_H
 
-#include <gsm/bursts_printer.h>
+#include <gsm/misc_utils/bursts_printer.h>
 #include <set>
 
 namespace gr {

lib/misc_utils/controlled_const_source_f_impl.h

@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_IMPL_H
 #define INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_IMPL_H
 
-#include <gsm/controlled_const_source_f.h>
+#include <gsm/misc_utils/controlled_const_source_f.h>
 
 namespace gr {
   namespace gsm {

lib/misc_utils/controlled_rotator_cc_impl.h

@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H
 #define INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H
 
-#include <gsm/controlled_rotator_cc.h>
+#include <gsm/misc_utils/controlled_rotator_cc.h>
 #include <gnuradio/blocks/rotator.h>
 
 namespace gr {

lib/misc_utils/extract_system_info_impl.h

@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H
 #define INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H
 
-#include <gsm/extract_system_info.h>
+#include <gsm/misc_utils/extract_system_info.h>
 
 
 

lib/misc_utils/message_printer_impl.h

@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H
 #define INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H
 
-#include <gsm/message_printer.h>
+#include <gsm/misc_utils/message_printer.h>
 
 namespace gr {
   namespace gsm {

lib/receiver/receiver_impl.h

@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_RECEIVER_IMPL_H
 #define INCLUDED_GSM_RECEIVER_IMPL_H
 
-#include <gsm/receiver.h>
+#include <gsm/receiver/receiver.h>
 #include <gsm/gsmtap.h>
 #include <gsm_constants.h>
 #include <receiver_config.h>