Change in gr-gsm[master]: Fix compiling with the local libosmocore copy

[ptrkrysik]

Hello vvvelichkov,

I'd like you to do a code review. Please visit

    https://gerrit.osmocom.org/c/gr-gsm/+/24093

to review the following change.


Change subject: Fix compiling with the local libosmocore copy
......................................................................

Fix compiling with the local libosmocore copy

Change-Id: Ic72e6ca7f9cc40bc2d78b931e54e66cd71444835
---
M lib/CMakeLists.txt
1 file changed, 16 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/93/24093/1

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e7dae14..bc1baeb 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -77,22 +77,32 @@
 add_subdirectory(trx)
 
 if(NOT LOCAL_OSMOCOM)
-    list (APPEND grgsm_link_libraries ${LIBOSMOCORE_LIBRARIES} ${LIBOSMOCODEC_LIBRARIES} ${LIBOSMOGSM_LIBRARY})
+    list (APPEND grgsm_link_libraries ${LIBOSMOCORE_LIBRARY} ${LIBOSMOCODEC_LIBRARY} ${LIBOSMOGSM_LIBRARY})
     if(LIBOSMOCODING_FOUND)
         list (APPEND grgsm_link_libraries
-           ${LIBOSMOCODING_LIBRARIES}
-	)
+           ${LIBOSMOCODING_LIBRARY}
+        )
         list (APPEND grgsm_include_directories
-           ${LIBOSMOCORE_INCLUDE_DIR}
+           PUBLIC $<BUILD_INTERFACE:${LIBOSMOCORE_INCLUDE_DIR}>
+        )
+    else()
+        list (APPEND grgsm_include_directories
+            PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/decoding>
         )
     endif()
-endif()
+else(NOT LOCAL_OSMOCOM)
+    list (APPEND grgsm_include_directories
+        PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/decoding>
+    )
+endif(NOT LOCAL_OSMOCOM)
+
 
 add_library(grgsm SHARED ${grgsm_sources})
-target_link_libraries(grgsm gnuradio::gnuradio-runtime gnuradio::gnuradio-filter volk osmocoding)
+target_link_libraries(grgsm gnuradio::gnuradio-runtime gnuradio::gnuradio-filter volk ${grgsm_link_libraries})
 target_include_directories(grgsm
     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/receiver>
+    ${grgsm_include_directories}
     PUBLIC $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
     PUBLIC $<INSTALL_INTERFACE:include>
   )

-- 
To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24093
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-Change-Id: Ic72e6ca7f9cc40bc2d78b931e54e66cd71444835
Gerrit-Change-Number: 24093
Gerrit-PatchSet: 1
Gerrit-Owner: ptrkrysik <ptrkrysik at gmail.com>
Gerrit-Reviewer: vvvelichkov <vvvelichkov at gmail.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210503/dc888fe9/attachment.htm>