<p>ptrkrysik <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/gr-gsm/+/24093">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  ptrkrysik: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix compiling with the local libosmocore copy<br><br>Change-Id: Ic72e6ca7f9cc40bc2d78b931e54e66cd71444835<br>---<br>M lib/CMakeLists.txt<br>1 file changed, 16 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt</span><br><span>index e7dae14..bc1baeb 100644</span><br><span>--- a/lib/CMakeLists.txt</span><br><span>+++ b/lib/CMakeLists.txt</span><br><span>@@ -77,22 +77,32 @@</span><br><span> add_subdirectory(trx)</span><br><span> </span><br><span> if(NOT LOCAL_OSMOCOM)</span><br><span style="color: hsl(0, 100%, 40%);">-    list (APPEND grgsm_link_libraries ${LIBOSMOCORE_LIBRARIES} ${LIBOSMOCODEC_LIBRARIES} ${LIBOSMOGSM_LIBRARY})</span><br><span style="color: hsl(120, 100%, 40%);">+    list (APPEND grgsm_link_libraries ${LIBOSMOCORE_LIBRARY} ${LIBOSMOCODEC_LIBRARY} ${LIBOSMOGSM_LIBRARY})</span><br><span>     if(LIBOSMOCODING_FOUND)</span><br><span>         list (APPEND grgsm_link_libraries</span><br><span style="color: hsl(0, 100%, 40%);">-           ${LIBOSMOCODING_LIBRARIES}</span><br><span style="color: hsl(0, 100%, 40%);">-       )</span><br><span style="color: hsl(120, 100%, 40%);">+           ${LIBOSMOCODING_LIBRARY}</span><br><span style="color: hsl(120, 100%, 40%);">+        )</span><br><span>         list (APPEND grgsm_include_directories</span><br><span style="color: hsl(0, 100%, 40%);">-           ${LIBOSMOCORE_INCLUDE_DIR}</span><br><span style="color: hsl(120, 100%, 40%);">+           PUBLIC $<BUILD_INTERFACE:${LIBOSMOCORE_INCLUDE_DIR}></span><br><span style="color: hsl(120, 100%, 40%);">+        )</span><br><span style="color: hsl(120, 100%, 40%);">+    else()</span><br><span style="color: hsl(120, 100%, 40%);">+        list (APPEND grgsm_include_directories</span><br><span style="color: hsl(120, 100%, 40%);">+            PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/decoding></span><br><span>         )</span><br><span>     endif()</span><br><span style="color: hsl(0, 100%, 40%);">-endif()</span><br><span style="color: hsl(120, 100%, 40%);">+else(NOT LOCAL_OSMOCOM)</span><br><span style="color: hsl(120, 100%, 40%);">+    list (APPEND grgsm_include_directories</span><br><span style="color: hsl(120, 100%, 40%);">+        PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/decoding></span><br><span style="color: hsl(120, 100%, 40%);">+    )</span><br><span style="color: hsl(120, 100%, 40%);">+endif(NOT LOCAL_OSMOCOM)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> add_library(grgsm SHARED ${grgsm_sources})</span><br><span style="color: hsl(0, 100%, 40%);">-target_link_libraries(grgsm gnuradio::gnuradio-runtime gnuradio::gnuradio-filter volk osmocoding)</span><br><span style="color: hsl(120, 100%, 40%);">+target_link_libraries(grgsm gnuradio::gnuradio-runtime gnuradio::gnuradio-filter volk ${grgsm_link_libraries})</span><br><span> target_include_directories(grgsm</span><br><span>     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include></span><br><span>     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/receiver></span><br><span style="color: hsl(120, 100%, 40%);">+    ${grgsm_include_directories}</span><br><span>     PUBLIC $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}></span><br><span>     PUBLIC $<INSTALL_INTERFACE:include></span><br><span>   )</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/gr-gsm/+/24093">change 24093</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/gr-gsm/+/24093"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: gr-gsm </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic72e6ca7f9cc40bc2d78b931e54e66cd71444835 </div>
<div style="display:none"> Gerrit-Change-Number: 24093 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: ptrkrysik <ptrkrysik@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: ptrkrysik <ptrkrysik@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: vvvelichkov <vvvelichkov@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>