From 37f45f8a4d2e6a25a66306b7460269b0e1ae8633 Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Mon, 7 Oct 2019 04:06:47 -0700 Subject: [PATCH] Fix some copypasta cruft in CMakeLists.txt --- CMakeLists.txt | 4 ++-- Dockerfile | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4df8ba0..ef70103 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,8 +97,8 @@ if(NOT CMAKE_MODULES_DIR) set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake) endif(NOT CMAKE_MODULES_DIR) -set(GR_INCLUDE_DIR include/foo) -set(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/foo) +set(GR_INCLUDE_DIR include/gr_air_modes) +set(GR_CMAKE_DIR ${CMAKE_MODULES_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_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d) diff --git a/Dockerfile b/Dockerfile index 6bbad2d..07638de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,12 @@ -FROM bistromath/gnuradio:3.7.11 +FROM bistromath/gnuradio:v3.8 ENV num_threads 10 MAINTAINER bistromath@gmail.com version: 0.1 WORKDIR /opt + +RUN apt install -y python3-zmq python3-scipy + RUN mkdir gr-air-modes COPY . gr-air-modes/ WORKDIR /opt/gr-air-modes