FGFS-4.1/gr-air-modes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some copypasta cruft in CMakeLists.txt

Browse Source
This commit is contained in:
Nick Foster 2019-10-07 04:06:47 -07:00
parent 9b17824c49
commit 37f45f8a4d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -97,8 +97,8 @@ if(NOT CMAKE_MODULES_DIR)
set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake) set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
endif(NOT CMAKE_MODULES_DIR) endif(NOT CMAKE_MODULES_DIR)
set(GR_INCLUDE_DIR include/foo) set(GR_INCLUDE_DIR include/gr_air_modes)
set(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/foo) set(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/${CMAKE_PROJECT_NAME})
set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME}) set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}) set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME})
set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d) set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d)

5
Dockerfile
View File

@ -1,9 +1,12 @@
FROM bistromath/gnuradio:3.7.11 FROM bistromath/gnuradio:v3.8
ENV num_threads 10 ENV num_threads 10
MAINTAINER bistromath@gmail.com version: 0.1 MAINTAINER bistromath@gmail.com version: 0.1
WORKDIR /opt WORKDIR /opt
RUN apt install -y python3-zmq python3-scipy
RUN mkdir gr-air-modes RUN mkdir gr-air-modes
COPY . gr-air-modes/ COPY . gr-air-modes/
WORKDIR /opt/gr-air-modes WORKDIR /opt/gr-air-modes