Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Development/cmake/NmosCppConan.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include(${CMAKE_CURRENT_BINARY_DIR}/conan.cmake)
# it would be nice to output a message if its a more recent version than tested, like:
# "Found Conan version 99.99 that is higher than the current tested version: " ${CONAN_VERSION_CUR})
set(CONAN_VERSION_MIN "1.33.0")
set(CONAN_VERSION_CUR "1.39.0")
set(CONAN_VERSION_CUR "1.45.0")
conan_check(VERSION ${CONAN_VERSION_MIN} REQUIRED)

set(NMOS_CPP_CONAN_BUILD_LIBS "missing" CACHE STRING "Semicolon separated list of libraries to build rather than download")
Expand Down
2 changes: 1 addition & 1 deletion Development/cmake/NmosCppDependencies.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Boost

set(BOOST_VERSION_MIN "1.54.0")
set(BOOST_VERSION_CUR "1.77.0")
set(BOOST_VERSION_CUR "1.78.0")
# note: 1.57.0 doesn't work due to https://svn.boost.org/trac10/ticket/10754
# note: some components are only required for one platform or other
# so find_package(Boost) is called after adding those components
Expand Down
2 changes: 1 addition & 1 deletion Development/conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[requires]
boost/1.77.0
boost/1.78.0
cpprestsdk/2.10.18
websocketpp/0.8.2
openssl/1.1.1m
Expand Down
14 changes: 7 additions & 7 deletions Documents/Dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ By default nmos-cpp uses [Conan](https://conan.io) to download most of its depen
2. Install Conan using `pip install conan`
Notes:
- On some platforms with Python 2 and Python 3 both installed this may need to be `pip3 install conan`
- Currently, Conan 1.33 or higher is required; version 1.42.1 (latest release at the time) has been tested
- Currently, Conan 1.43 or higher is required; version 1.45 (latest release at the time) has been tested
- Conan evolves fairly quickly, so it's worth running `pip install --upgrade conan` regularly
- By default [Conan assumes�semver�compatibility](https://docs.conan.io/en/1.42/creating_packages/define_abi_compatibility.html#versioning-schema).
Boost and other C++ libraries do not meet this expectation and break ABI compatibility between e.g. minor versions.
Expand All @@ -80,9 +80,9 @@ If using Conan, this section can be skipped.

1. Download a [recent release](http://www.boost.org/users/download/)
Notes:
- Several Boost releases have been tested, including Version 1.77.0 (latest release at the time) and Version 1.54.0
- Several Boost releases have been tested, including Version 1.78.0 (latest release at the time) and Version 1.54.0
- On Linux distributions, a Boost libraries package may already be installed, e.g. Ubuntu 14.04 LTS has Version 1.54.0
2. Expand the archive so that, for example, the boost\_1\_77\_0 directory is at the same level as the nmos-cpp directory
2. Expand the archive so that, for example, the boost\_1\_78\_0 directory is at the same level as the nmos-cpp directory
3. Build and stage (or install) the following Boost libraries for your platform/toolset:
- atomic
- chrono
Expand Down Expand Up @@ -152,8 +152,8 @@ If using Conan, this section can be skipped.
- Set ``Boost_USE_STATIC_LIBS`` (BOOL) to ``1`` (true)
- If CMake cannot find it automatically, set hints for [finding Boost](https://cmake.org/cmake/help/latest/module/FindBoost.html), for example:
- *Either* set ``Boost_DIR`` (PATH) to the location of the installed BoostConfig.cmake (since Boost 1.70.0)
- *Or* set ``BOOST_INCLUDEDIR`` (PATH) and ``BOOST_LIBRARYDIR`` (PATH) to the appropriate full paths, e.g. *``<home-dir>``*``/boost_1_77_0``
and *``<home-dir>``*``/boost_1_77_0/x64/lib`` respectively to match the suggested ``b2`` command
- *Or* set ``BOOST_INCLUDEDIR`` (PATH) and ``BOOST_LIBRARYDIR`` (PATH) to the appropriate full paths, e.g. *``<home-dir>``*``/boost_1_78_0``
and *``<home-dir>``*``/boost_1_78_0/x64/lib`` respectively to match the suggested ``b2`` command
- Due to interactions with other dependencies, it may also be necessary to explicitly set ``WERROR`` (BOOL) to ``0`` so that compiler warnings are not treated as errors
- To speed up the build by omitting the C++ REST SDK sample apps and test suite, set ``BUILD_SAMPLES`` and ``BUILD_TESTS`` (BOOL) to ``0`` (false)
3. Use CMake to generate build/project files, and then build *and* install
Expand All @@ -172,8 +172,8 @@ cmake .. ^
-DCPPREST_EXCLUDE_COMPRESSION:BOOL="1" ^
-DCMAKE_CONFIGURATION_TYPES:STRING="Debug;Release" ^
-DBoost_USE_STATIC_LIBS:BOOL="1" ^
-DBOOST_INCLUDEDIR:PATH="<home-dir>/boost_1_77_0" ^
-DBOOST_LIBRARYDIR:PATH="<home-dir>/boost_1_77_0/x64/lib" ^
-DBOOST_INCLUDEDIR:PATH="<home-dir>/boost_1_78_0" ^
-DBOOST_LIBRARYDIR:PATH="<home-dir>/boost_1_78_0/x64/lib" ^
-DWERROR:BOOL="0" ^
-DBUILD_SAMPLES:BOOL="0" ^
-DBUILD_TESTS:BOOL="0"
Expand Down
8 changes: 4 additions & 4 deletions Documents/Getting-Started.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ Notes:

- If CMake cannot find it automatically, set hints for [finding Boost](https://cmake.org/cmake/help/latest/module/FindBoost.html), for example:
- *Either* set ``Boost_DIR`` (PATH) to the location of the installed *BoostConfig.cmake* (since Boost 1.70.0)
- *Or* set ``BOOST_INCLUDEDIR`` (PATH) and ``BOOST_LIBRARYDIR`` (PATH) to the appropriate full paths, e.g. *``<home-dir>``*``/boost_1_77_0``
and *``<home-dir>``*``/boost_1_77_0/x64/lib`` respectively to match the suggested ``b2`` command
- *Or* set ``BOOST_INCLUDEDIR`` (PATH) and ``BOOST_LIBRARYDIR`` (PATH) to the appropriate full paths, e.g. *``<home-dir>``*``/boost_1_78_0``
and *``<home-dir>``*``/boost_1_78_0/x64/lib`` respectively to match the suggested ``b2`` command
- If CMake cannot find them automatically, set hints for finding the C++ REST SDK and WebSocket++, for example:
- Set ``cpprestsdk_DIR`` (PATH) to the location of the installed *cpprestsdk-config.cmake*
- *Either* set ``websocketpp_DIR`` (PATH) to the location of the installed *websocketpp-config.cmake*
Expand Down Expand Up @@ -75,8 +75,8 @@ cmake .. ^
-G "Visual Studio 16 2019" ^
-DCMAKE_CONFIGURATION_TYPES:STRING="Debug;Release" ^
-DBoost_USE_STATIC_LIBS:BOOL="1" ^
-DBOOST_INCLUDEDIR:PATH="<home-dir>/boost_1_77_0" ^
-DBOOST_LIBRARYDIR:PATH="<home-dir>/boost_1_77_0/x64/lib" ^
-DBOOST_INCLUDEDIR:PATH="<home-dir>/boost_1_78_0" ^
-DBOOST_LIBRARYDIR:PATH="<home-dir>/boost_1_78_0/x64/lib" ^
-DWEBSOCKETPP_INCLUDE_DIR:PATH="<home-dir>/cpprestsdk/Release/libs/websocketpp"
```

Expand Down
4 changes: 2 additions & 2 deletions Sandbox/conan-recipe/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ def config_options(self):

def requirements(self):
# for now, consistent with project's conanfile.txt
self.requires("boost/1.77.0")
self.requires("boost/1.78.0")
self.requires("cpprestsdk/2.10.18")
self.requires("websocketpp/0.8.2")
self.requires("openssl/1.1.1l")
self.requires("openssl/1.1.1m")
self.requires("json-schema-validator/2.1.0")

def build_requirements(self):
Expand Down