aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Krysik <ptrkrysik@gmail.com>2017-09-18 21:36:06 +0200
committerPiotr Krysik <ptrkrysik@gmail.com>2017-09-18 21:36:06 +0200
commit9b5617a3ef6a3a048a0521035c7454faf49d62d8 (patch)
treea6f8973a2e238254a3bc2ce99e9b514dd16971b9
parent184d7064a629ce1fada20256ef8c87e6b709693b (diff)
Corrections in the buildsystem
-rw-r--r--lib/decoding/CMakeLists.txt2
-rw-r--r--lib/decoding/openbts/CMakeLists.txt1
-rw-r--r--python/CMakeLists.txt2
-rw-r--r--python/demapping/CMakeLists.txt3
-rw-r--r--python/misc_utils/CMakeLists.txt6
-rw-r--r--[-rwxr-xr-x]python/misc_utils/arfcn.py0
-rw-r--r--python/receiver/CMakeLists.txt3
-rw-r--r--swig/grgsm_swig.i1
8 files changed, 11 insertions, 7 deletions
diff --git a/lib/decoding/CMakeLists.txt b/lib/decoding/CMakeLists.txt
index 144c006..cacfc55 100644
--- a/lib/decoding/CMakeLists.txt
+++ b/lib/decoding/CMakeLists.txt
@@ -17,6 +17,8 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
+add_subdirectory(osmocom/coding)
+add_subdirectory(openbts)
add_subdirectory(osmocom/coding)
add_subdirectory(openbts)
diff --git a/lib/decoding/openbts/CMakeLists.txt b/lib/decoding/openbts/CMakeLists.txt
index eb857bf..18977b1 100644
--- a/lib/decoding/openbts/CMakeLists.txt
+++ b/lib/decoding/openbts/CMakeLists.txt
@@ -25,4 +25,3 @@ add_sources(
GSM503Tables.cpp
ViterbiR204.cpp
)
-
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 6947d8f..a4a4338 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -44,6 +44,7 @@ include(GrTest)
set(GR_TEST_TARGET_DEPS gr-gsm)
set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig:${CMAKE_BINARY_DIR}/python/misc_utils)
+GR_ADD_TEST(qa_arfcn ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_arfcn.py)
GR_ADD_TEST(qa_decryption ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_decryption.py)
GR_ADD_TEST(qa_burst_printer ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_burst_printer.py)
GR_ADD_TEST(qa_message_printer ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_message_printer.py)
@@ -53,7 +54,6 @@ GR_ADD_TEST(qa_burst_timeslot_filter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE
GR_ADD_TEST(qa_burst_sdcch_subslot_filter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_burst_sdcch_subslot_filter.py)
GR_ADD_TEST(qa_burst_fnr_filter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_burst_fnr_filter.py)
GR_ADD_TEST(qa_dummy_burst_filter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_dummy_burst_filter.py)
-GR_ADD_TEST(qa_arfcn ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_arfcn.py)
#GR_ADD_TEST(qa_msg_to_tag ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_msg_to_tag.py)
#GR_ADD_TEST(qa_controlled_fractional_resampler_cc ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_controlled_fractional_resampler_cc.py)
#GR_ADD_TEST(qa_uplink_downlink_splitter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_uplink_downlink_splitter.py)
diff --git a/python/demapping/CMakeLists.txt b/python/demapping/CMakeLists.txt
index fd6e112..9f0efb4 100644
--- a/python/demapping/CMakeLists.txt
+++ b/python/demapping/CMakeLists.txt
@@ -17,7 +17,8 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-install(FILES
+GR_PYTHON_INSTALL(
+ FILES
gsm_bcch_ccch_demapper.py
gsm_bcch_ccch_sdcch4_demapper.py
gsm_sdcch8_demapper.py DESTINATION ${GR_PYTHON_DIR}/grgsm
diff --git a/python/misc_utils/CMakeLists.txt b/python/misc_utils/CMakeLists.txt
index ffba1b7..1accda9 100644
--- a/python/misc_utils/CMakeLists.txt
+++ b/python/misc_utils/CMakeLists.txt
@@ -17,8 +17,10 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-install(FILES
+GR_PYTHON_INSTALL(
+ FILES
arfcn.py
clock_offset_corrector_tagged.py
- hier_block.py DESTINATION ${GR_PYTHON_DIR}/grgsm
+ hier_block.py
+ fn_time.py DESTINATION ${GR_PYTHON_DIR}/grgsm
)
diff --git a/python/misc_utils/arfcn.py b/python/misc_utils/arfcn.py
index 349e8ce..349e8ce 100755..100644
--- a/python/misc_utils/arfcn.py
+++ b/python/misc_utils/arfcn.py
diff --git a/python/receiver/CMakeLists.txt b/python/receiver/CMakeLists.txt
index 07fe2a4..8ab902b 100644
--- a/python/receiver/CMakeLists.txt
+++ b/python/receiver/CMakeLists.txt
@@ -17,7 +17,8 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-install(FILES
+GR_PYTHON_INSTALL(
+ FILES
gsm_input.py
fcch_burst_tagger.py
sch_detector.py
diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i
index 66615e6..57ed777 100644
--- a/swig/grgsm_swig.i
+++ b/swig/grgsm_swig.i
@@ -143,4 +143,3 @@ GR_SWIG_BLOCK_MAGIC2(gsm, burst_source);
GR_SWIG_BLOCK_MAGIC2(gsm, message_source);
%include "grgsm/qa_utils/message_sink.h"
GR_SWIG_BLOCK_MAGIC2(gsm, message_sink);
-