Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set path to Boost libraries #1872

Merged
merged 3 commits into from Aug 3, 2019
Merged

Set path to Boost libraries #1872

merged 3 commits into from Aug 3, 2019

Conversation

sergeuz
Copy link
Member

@sergeuz sergeuz commented Aug 2, 2019

Problem

It is now required to have Boost libraries installed globally in the system to build CMake-based unit tests locally (this change was introduced in #1869). This PR changes the paths to Boost libraries back to $BOOST_ROOT which is set by CI scripts.

Note: This is a temporary solution. Ideally, we'd want all necessary paths to be detected and set using built-in CMake mechanisms.

Steps to Test

  • Run source ci/install_boost.sh.
  • Run ci/build_boost.sh.
  • Compile and run CMake-based unit tests.

  • [internal] Set path to Boost libraries #1872

zfields
zfields previously requested changes Aug 2, 2019
test/unit_tests/CMakeLists.txt Outdated Show resolved Hide resolved
find_package(Boost
1.59.0 EXACT
REQUIRED
COMPONENTS program_options random regex system thread
Copy link
Contributor

@zfields zfields Aug 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sergeuz I put random in this list because of <particle-iot/device-os>/ci/build_boost.sh, but based on the list in your first PR, we may not need to check for it.

@sergeuz
Copy link
Member Author

sergeuz commented Aug 3, 2019

@zfields The boost path changes work like a charm, thank you! I enabled multithreading support in Boost – not sure why we were building it in single-threaded mode

@@ -10,7 +10,6 @@ if contains "${BUILD_PLATFORM[*]}" unit-test; then
( source ./ci/install_gcovr.sh
source ./ci/install_boost.sh
./ci/build_boost.sh &&
cp -r ${BOOST_ROOT}/boost/ /usr/include/ &&
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@sergeuz sergeuz requested a review from avtolstoy August 3, 2019 13:19
@sergeuz sergeuz dismissed zfields’s stale review August 3, 2019 14:40

The requested changes have been addressed by the requester :)

@sergeuz sergeuz merged commit 49b0d5e into develop Aug 3, 2019
@sergeuz sergeuz deleted the fix/boost_root branch August 3, 2019 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants