diff options
author | Piotr Krysik <ptrkrysik@gmail.com> | 2017-09-19 07:58:49 +0200 |
---|---|---|
committer | Piotr Krysik <ptrkrysik@gmail.com> | 2017-09-19 07:58:49 +0200 |
commit | cb04d0dd5098b63f11b00de134634e39349c8149 (patch) | |
tree | 72b6ef563a69f494281cf4cc203b7f0430d9ede9 /lib | |
parent | 3b06bdaa06e48b412e69ddb1834cd9c7353b3a20 (diff) | |
parent | d890cd3b368abba73003482327ee5740d5dfcf69 (diff) |
Merge branch 'development' into ptrkrysik/trx
# Conflicts:
# swig/grgsm_swig.i
Diffstat (limited to 'lib')
-rw-r--r-- | lib/CMakeLists.txt | 2 | ||||
-rw-r--r-- | lib/decoding/CMakeLists.txt | 7 | ||||
-rw-r--r-- | lib/decoding/openbts/CMakeLists.txt | 1 | ||||
-rw-r--r-- | lib/decoding/osmocom/coding/CMakeLists.txt | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 199b63f..511d459 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -59,7 +59,7 @@ configure_file( ESCAPE_QUOTES @ONLY) -add_sources(constants.cc) +list(APPEND grgsm_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc) ######################################################################### # Subdirecories ######################################################################### diff --git a/lib/decoding/CMakeLists.txt b/lib/decoding/CMakeLists.txt index 0305a07..cacfc55 100644 --- a/lib/decoding/CMakeLists.txt +++ b/lib/decoding/CMakeLists.txt @@ -17,6 +17,11 @@ # 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) add_sources( control_channels_decoder_impl.cc @@ -24,5 +29,3 @@ add_sources( sch.c ) -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/lib/decoding/osmocom/coding/CMakeLists.txt b/lib/decoding/osmocom/coding/CMakeLists.txt index 615a2f6..8e68577 100644 --- a/lib/decoding/osmocom/coding/CMakeLists.txt +++ b/lib/decoding/osmocom/coding/CMakeLists.txt @@ -17,7 +17,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -add_sources(APPEND grgsm_sources +add_sources( gsm0503_conv.c gsm0503_coding.c gsm0503_interleaving.c |