Skip to content

[cmake] fix for Boost 1.70 #65

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.

Sign up for GitHub

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

Merged
fabiencastan merged 11 commits into from
Feb 5, 2020
Merged

[cmake] fix for Boost 1.70 #65

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d7d25d0
[cmake] fix for Boost 1.70
simogasp Dec 9, 2019
94b68a7
[cmake] removed redundant find_package
simogasp Dec 18, 2019
fb25124
[apps] fix includes with standard cpp
simogasp Dec 18, 2019
aed95c5
[apps] using nullptr
simogasp Dec 18, 2019
5d80253
[apps] using EXIT_{SUCCESS,FAILURE}
simogasp Dec 18, 2019
4e79852
[apps] reducing var scope
simogasp Dec 18, 2019
f9f5b91
[apps] better code
simogasp Dec 18, 2019
38b88e6
[apps] better init
simogasp Dec 18, 2019
fdd187c
[apps] const
simogasp Dec 18, 2019
325a5b1
[apps] auto
simogasp Dec 18, 2019
3b5f80d
[apps] range loop
simogasp Dec 18, 2019
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
4 changes: 4 additions & 0 deletions src/application/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ endif()
find_package(Boost 1.53.0 REQUIRED COMPONENTS program_options system filesystem)
Copy link
Copy Markdown
Member

@griwodz griwodz Dec 18, 2019

Choose a reason for hiding this comment

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

@simogasp Do we need find_package(Boost ...) twice for this fix to work?

Copy link
Copy Markdown
Member Author

@simogasp simogasp Dec 18, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

yes because the applications can be an independent cmake project (you can use popsift installed somewhere else to build, so you can test the use as 3rd pary) and requires a different set of components from boost.

Copy link
Copy Markdown
Member Author

@simogasp simogasp Dec 18, 2019

Choose a reason for hiding this comment

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

oh no, sorry i didn't see that, i thought you were referring to the one in the main cmakefile. Obviously this is unnecessary, i'll fix it

find_package(DevIL COMPONENTS IL ILU) # yields IL_FOUND, IL_LIBRARIES, IL_INCLUDE_DIR

set(Boost_INCLUDE_DIRS "")
set(Boost_LIBRARIES "")
find_package(Boost 1.53.0 REQUIRED COMPONENTS filesystem program_options)

set(PD_INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
set(PD_LINK_LIBS ${Boost_LIBRARIES} ${CUDA_CUDADEVRT_LIBRARY})

Expand Down