github-mirrors/blah2
1
0
Fork 0
mirror of https://github.com/30hours/blah2.git synced 2024-11-18 12:33:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Versioning issue as described in #5

Browse source
This commit is contained in:
30hours 2024-01-27 08:44:35 +00:00
parent 63267f8a65
commit a8109e0450
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -16,7 +16,7 @@ find_package(Armadillo CONFIG REQUIRED)
find_package(Catch2 CONFIG REQUIRED) find_package(Catch2 CONFIG REQUIRED)
set(CMAKE_PREFIX_PATH "/opt/uhd" ${CMAKE_PREFIX_PATH}) set(CMAKE_PREFIX_PATH "/opt/uhd" ${CMAKE_PREFIX_PATH})
find_package(UHD "4.6.0.0" CONFIG REQUIRED) find_package(UHD "4.1.0.0" CONFIG REQUIRED)
# TODO: when release CI is finished, don't use these dirs, install target should go to prod # TODO: when release CI is finished, don't use these dirs, install target should go to prod
SET (PROJECT_ROOT "${PROJECT_SOURCE_DIR}") SET (PROJECT_ROOT "${PROJECT_SOURCE_DIR}")

3
Dockerfile
View file

@ -31,7 +31,7 @@ RUN chmod +x /blah2/lib/sdrplay-3.0.7/SDRplay_RSP_API-Linux-3.07.1.run \
&& ldconfig && ldconfig
# install UHD API # install UHD API
RUN git clone https://github.com/EttusResearch/uhd /opt/uhd \ RUN git clone https://github.com/MicroPhase/antsdr_uhd /opt/uhd \
&& mkdir -p /opt/uhd/host/build && cd /opt/uhd/host/build \ && mkdir -p /opt/uhd/host/build && cd /opt/uhd/host/build \
&& cmake -DCMAKE_INSTALL_PREFIX=/opt/uhd -DENABLE_PYTHON_API=OFF \ && cmake -DCMAKE_INSTALL_PREFIX=/opt/uhd -DENABLE_PYTHON_API=OFF \
-DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_X400=OFF \ -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_X400=OFF \
@ -48,6 +48,7 @@ LABEL maintainer="30hours <nathan@30hours.dev>"
ADD src src ADD src src
ADD test test ADD test test
ADD CMakeLists.txt CMakePresets.json Doxyfile /blah2/ ADD CMakeLists.txt CMakePresets.json Doxyfile /blah2/
RUN ls -lah /opt/uhd/lib/cmake/uhd/ && cat /opt/uhd/lib/cmake/uhd/UHDConfigVersion.cmake
RUN mkdir -p build && cd build && cmake -S . --preset prod-release \ RUN mkdir -p build && cd build && cmake -S . --preset prod-release \
-DCMAKE_PREFIX_PATH=/blah2/lib/vcpkg_installed/x64-linux/share .. \ -DCMAKE_PREFIX_PATH=/blah2/lib/vcpkg_installed/x64-linux/share .. \
&& cd prod-release && make && cd prod-release && make