Skip to content

Commit

Permalink
Make build and tests pass on OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
hbe72 committed May 2, 2018
1 parent a62d7ac commit d503318
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
cmake_minimum_required(VERSION 3.7.2)
project(cnl)

# CNL
project(dsp)

find_package(Cnl REQUIRED)

Expand All @@ -10,7 +8,6 @@ find_package(Cnl REQUIRED)
find_package(GTest REQUIRED)

# DSP tests

set(sample_dsp_sources
test/basic_math.cpp
test/biquad.cpp
Expand All @@ -23,6 +20,7 @@ set(sample_dsp_sources
test/virtual_float.cpp)

include(CTest)
include("cmake/common.cmake")

foreach(source ${sample_dsp_sources})
string(REPLACE "\." "_" target "${source}")
Expand All @@ -39,3 +37,5 @@ foreach(source ${sample_dsp_sources})
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
endforeach(source)

install(DIRECTORY include/ DESTINATION include)
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
# dsp

## Instructions

(Tested on Debian Stretch.)
In an empty workspace folder, run the following script:

```sh
#!/bin/bash

# clone the repositories
git clone git@github.com:hbe72/cnl --branch develop
git clone git@github.com:johnmcfarlane/cnl --branch develop
git clone git@github.com:google/googletest --branch master
git clone git@github.com:johnmcfarlane/dsp
git clone git@github.com:hbe72/dsp

# create an env directory (for include, lib etc.)
ENV="$(pwd)/env"
Expand All @@ -33,9 +31,9 @@ popd

# configure, build and test DSP
mkdir -p build/dsp
pushd build/dsp
cmake -DCMAKE_INSTALL_PREFIX=$ENV ../../dsp
cmake --build . -- -j 8
pushd build/dspcd
cmake -DCMAKE_INSTALL_PREFIX=$ENV -DCMAKE_PREFIX_PATH=$ENV ../../dsp
cmake --build . -- -j 8 install
ctest
popd
```

0 comments on commit d503318

Please sign in to comment.