Changes in buildsystem bringing back capability to quickly add new blocks with use of gr_modool.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0dff42..0e92e87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@
# Project setup
########################################################################
cmake_minimum_required(VERSION 2.6)
-project(gr-gsm CXX C)
+project(gr-grgsm CXX C)
enable_testing()
#set(CMAKE_BUILD_TYPE "Debug")
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 0baaac8..caf2660 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -22,7 +22,7 @@
add_subdirectory(demapping)
add_subdirectory(receiver)
add_subdirectory(misc_utils)
-
install(FILES
- gsm_block_tree.xml DESTINATION share/gnuradio/grc/blocks
+ gsm_block_tree.xml
+ DESTINATION share/gnuradio/grc/blocks
)
diff --git a/include/grgsm/CMakeLists.txt b/include/grgsm/CMakeLists.txt
index 6df01d7..fd44c54 100644
--- a/include/grgsm/CMakeLists.txt
+++ b/include/grgsm/CMakeLists.txt
@@ -20,14 +20,16 @@
########################################################################
# Install public header files
########################################################################
+install(FILES
+ plotting.hpp
+ api.h
+ gsmtap.h
+ DESTINATION include/grgsm
+)
+
add_subdirectory(decoding)
add_subdirectory(decryption)
add_subdirectory(demapping)
add_subdirectory(receiver)
add_subdirectory(misc_utils)
-install(FILES
- plotting.hpp
- api.h
- gsmtap.h DESTINATION include/grgsm
-)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 2c29631..00b1faa 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -24,7 +24,7 @@
include_directories(${Boost_INCLUDE_DIR} receiver)
link_directories(${Boost_LIBRARY_DIRS})
-list(APPEND gsm_sources
+list(APPEND grgsm_sources
receiver/receiver_impl.cc
receiver/receiver_config.cc
receiver/viterbi_detector.cc
@@ -41,9 +41,9 @@
misc_utils/message_printer_impl.cc
misc_utils/tmsi_dumper_impl.cc
decryption/decryption_impl.cc
-)
+ )
-add_library(gnuradio-gsm SHARED ${gsm_sources})
+add_library(gnuradio-gsm SHARED ${grgsm_sources})
target_link_libraries(gnuradio-gsm ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_LIBRARIES}
# libraries required by plotting.h - have troubles to be installed by pybombs
# boost_iostreams
@@ -68,13 +68,13 @@
#include_directories(${CPPUNIT_INCLUDE_DIRS})
-#list(APPEND test_gsm_sources
+#list(APPEND test_grgsm_sources
# ${CMAKE_CURRENT_SOURCE_DIR}/test_gsm.cc
# ${CMAKE_CURRENT_SOURCE_DIR}/qa_gsm.cc
# ${CMAKE_CURRENT_SOURCE_DIR}/qa_receiver.cc
#)
-#add_executable(test-gsm ${test_gsm_sources})
+#add_executable(test-gsm ${test_grgsm_sources})
#target_link_libraries(
# test-gsm