diff --git a/BuildInstructions.md b/BuildInstructions.md index 3316905..30c60ad 100644 --- a/BuildInstructions.md +++ b/BuildInstructions.md @@ -31,6 +31,12 @@ Just download and install binaries from https://cmake.org/download/ ## boost #### Linux + +If you preffer using system installed boost, then remove ` +set ( Boost_NO_SYSTEM_PATHS ON )` from websocketServer/CMakeLists.txt + +To build your own boost: + wget https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.gz tar -xf ./boost_1_68_0.tar.gz cd boost_1_68_0 @@ -121,11 +127,11 @@ Tip: you might need to configure with: If you managed to build or install dependencies, you're ready do build habdec - git clone https://github.com/ogre/habdec.git + git clone --recurse-submodules https://github.com/ogre/habdec.git cd habdec mkdir build cd build - cmake -D BOOST_ROOT=/path/to/boost_1.68 -D FFTW_ROOT=/path/to/fftwf/install -DCMAKE_BUILD_TYPE=Release ../code + cmake -D BOOST_ROOT=/path/to/boost_1.68 -D FFTW_ROOT=/path/to/fftwf/install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=Off ../code make -j 4 make install diff --git a/code/websocketServer/CMakeLists.txt b/code/websocketServer/CMakeLists.txt index adfe5b4..eefa50e 100755 --- a/code/websocketServer/CMakeLists.txt +++ b/code/websocketServer/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${FFTW3f_INCLUDE_DIRS} ) # boost set ( Boost_NO_BOOST_CMAKE ON ) -set ( Boost_NO_SYSTEM_PATHS ON ) +set ( Boost_NO_SYSTEM_PATHS ON ) #remove line to use system installed boost set ( Boost_USE_STATIC_LIBS ON ) add_definitions ( -DBOOST_ALL_NO_LIB ) find_package(Boost REQUIRED COMPONENTS program_options system date_time ) @@ -74,6 +74,7 @@ list(APPEND websocketServer_src "${CMAKE_CURRENT_BINARY_DIR}/git_repo_sha1.cpp" add_executable ( habdecWebsocketServer ${websocketServer_src} ) target_link_libraries( habdecWebsocketServer + # atomic # uncomment under raspbian Decoder IQSource ${Boost_LIBRARIES}