commit 9c58846b0462958068adb3ec5dc04cc18874dffb
author Roman Khassraf <roman@khassraf.at> Fri Jul 17 13:57:24 2015 +0200
committer Roman Khassraf <roman@khassraf.at> Fri Jul 17 13:57:24 2015 +0200
tree 2d1e404bdcc1002509f8b9f6738a0bcfd7779986
parent f329ae5633b98bec3365c6337099b25fca469188

Added libosmocore to build. Preparation for issue #85

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a88ba6..c8fac31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,6 +93,7 @@
 find_package(Volk)
 find_package(CppUnit)
 find_package(Doxygen)
+find_package(Libosmocore)
 
 if(NOT GNURADIO_RUNTIME_FOUND)
     message(FATAL_ERROR "GnuRadio Runtime required to compile gr-gsm")
@@ -103,6 +104,9 @@
 if(NOT CPPUNIT_FOUND)
     message(FATAL_ERROR "CppUnit required to compile gr-gsm")
 endif()
+if(NOT LIBOSMOCORE_FOUND)
+    message(FATAL_ERROR "Libosmocore required to compile gr-gsm")
+endif()
 
 ########################################################################
 # Setup doxygen option
@@ -124,6 +128,7 @@
     ${Boost_INCLUDE_DIRS}
     ${CPPUNIT_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+    ${LIBOSMOCORE_INCLUDE_DIR}
 )
 
 link_directories(

cmake/Modules/FindLibosmocore.cmake

diff --git a/cmake/Modules/FindLibosmocore.cmake b/cmake/Modules/FindLibosmocore.cmake
new file mode 100644
index 0000000..9eff233
--- /dev/null
+++ b/cmake/Modules/FindLibosmocore.cmake
@@ -0,0 +1,42 @@
+find_package(PkgConfig)
+pkg_check_modules(PC_libosmocore libosmocore)
+set(LIBOSMOCORE_DEFINITIONS ${PC_LIBOSMOCORE_CFLAGS_OTHER})
+
+find_path(
+        LIBOSMOCORE_INCLUDE_DIR
+        NAMES   osmocom/core/application.h
+        HINTS   ${PC_libosmocore_INCLUDEDIR}
+                ${PC_libosmocore_INCLUDE_DIRS}
+                ${CMAKE_INSTALL_PREFIX}/include
+        PATHS   /usr/local/include
+                /usr/include
+)
+
+find_library(
+        LIBOSMOCORE_LIBRARY
+        NAMES   libosmocore osmocore
+        HINTS   ${PC_libosmocore_LIBDIR}
+                ${PC_libosmocore_LIBRARY_DIRS}
+                ${CMAKE_INSTALL_PREFIX}/lib/
+                ${CMAKE_INSTALL_PREFIX}/lib64/
+        PATHS   /usr/local/lib
+                /usr/lib
+)
+
+find_library(
+        LIBOSMOCORE_GSM_LIBRARY
+        NAMES   libosmogsm osmogsm
+        HINTS   ${PC_libosmocore_LIBDIR}
+                ${PC_libosmocore_LIBRARY_DIRS}
+                ${CMAKE_INSTALL_PREFIX}/lib/
+                ${CMAKE_INSTALL_PREFIX}/lib64/
+        PATHS   /usr/local/lib
+                /usr/lib
+)
+
+set(LIBOSMOCORE_LIBRARIES ${LIBOSMOCORE_LIBRARY} ${LIBOSMOCORE_GSM_LIBRARY})
+set(LIBOSMOCORE_INCLUDE_DIRS ${LIBOSMOCORE_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(libosmocore  DEFAULT_MSG LIBOSMOCORE_LIBRARY LIBOSMOCORE_INCLUDE_DIR)
+mark_as_advanced(LIBOSMOCORE_INCLUDE_DIR LIBOSMOCORE_LIBRARY )

lib/CMakeLists.txt

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index f2d70e3..d906396 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -55,7 +55,7 @@
     decryption/decryption_impl.cc )
 
 add_library(gnuradio-grgsm SHARED ${grgsm_sources})
-target_link_libraries(gnuradio-grgsm ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_LIBRARIES}
+target_link_libraries(gnuradio-grgsm ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_LIBRARIES} ${LIBOSMOCORE_LIBRARIES}
 # libraries required by plotting.h - have troubles to be installed by pybombs
 #    boost_iostreams
 #    boost_system