CI debug 11

cropinghigh · May 8, 2024 · 39833f8 · 39833f8
1 parent 92213fb
commit 39833f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
@@ -25,7 +25,7 @@ jobs:
         - name: Install libosmocore
           run: sudo apt-get update && sudo apt-get install libosmocore libosmocore-dev
         - name: Cmake
-          run: 'mkdir build && cd build && ls -lah .. && cmake .. -DSDRPP_MODULE_CMAKE="$GITHUB_WORKSPACE/sdrpp_module_hack.cmake"'
+          run: 'mkdir build && cd build && ls -lah .. && cmake .. -DSDRPP_CORE_ROOT="$GITHUB_WORKSPACE/sdrpp_lib/SDRPlusPlus-nightly/core/src" -DSDRPP_LIB_ROOT="$GITHUB_WORKSPACE/sdrpp_lib/usr/lib" -DSDRPP_MODULE_CMAKE="$GITHUB_WORKSPACE/sdrpp_module_hack.cmake"'
         - name: Download ETSI codec
           run: 'cd src/decoder/etsi_codec-patches && ./download_and_patch.sh'
         - name: Make

diff --git a/.github/workflows/sdrpp_module_hack.cmake b/.github/workflows/sdrpp_module_hack.cmake
@@ -2,6 +2,9 @@
 if (NOT SDRPP_CORE_ROOT)
     set(SDRPP_CORE_ROOT "../sdrpp_lib/SDRPlusPlus-nightly/core/src")
 endif ()
+if (NOT SDRPP_LIB_ROOT)
+    set(SDRPP_LIB_ROOT "/usr/lib")
+endif ()
 if (NOT SDRPP_MODULE_COMPILER_FLAGS)
     # Compiler flags
     if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
@@ -27,7 +30,7 @@ endif ()
 
 # Created shared lib and link to core
 add_library(${PROJECT_NAME} SHARED ${SRC})
-target_link_libraries(${PROJECT_NAME} PRIVATE ../sdrpp_lib/sdrpp_core/usr/lib/libsdrpp_core.so)
+target_link_libraries(${PROJECT_NAME} PRIVATE "${SDRPP_LIB_ROOT}/libsdrpp_core.so")
 target_include_directories(${PROJECT_NAME} PRIVATE "${SDRPP_CORE_ROOT}/src/" "${SDRPP_CORE_ROOT}/src/imgui/")
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")