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.

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

Jump to bottom

Do not use find_package() if boost is already included as a submodule #23

Merged
merged 10 commits into from
Jul 25, 2023
Merged

Do not use find_package() if boost is already included as a submodule #23

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
de302b4
use boost as submodule
greg7mdp May 5, 2023
e785cc7
rearrange boost dependencies order.
greg7mdp May 5, 2023
b9472c5
Update `boost` component check as per PR comment.
greg7mdp May 8, 2023
0a82417
Merge branch 'main' of github.com:AntelopeIO/appbase into boost_submo…
greg7mdp Jul 5, 2023
2ddf3f8
Update `find_package()` to include all boost components we use.
greg7mdp Jul 6, 2023
1b08148
Undo previous change
greg7mdp Jul 6, 2023
f078f79
Use targets from boost submodule only if present.
greg7mdp Jul 6, 2023
02a08a3
Merge branch 'gh-672-fix' into boost_submodule
greg7mdp Jul 7, 2023
6316189
Merge branch 'gh-672-fix' into boost_submodule
greg7mdp Jul 7, 2023
fe1b3a6
Merge branch 'main' of https://github.com/AntelopeIO/appbase into boo…
greg7mdp Jul 18, 2023
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
9 changes: 8 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads)

find_package(Boost 1.67 REQUIRED COMPONENTS program_options system)
if(NOT TARGET Boost::program_options)
find_package(Boost 1.67 REQUIRED COMPONENTS program_options system)
endif()

if( APPLE )
# Apple Specific Options Here
Expand All @@ -47,6 +49,11 @@ add_library( appbase
)

target_link_libraries( appbase PUBLIC Boost::program_options Boost::system Threads::Threads)

if(TARGET Boost::asio)
target_link_libraries( appbase PUBLIC Boost::asio Boost::unit_test_framework Boost::signals2 )
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
target_link_libraries( appbase PUBLIC stdc++fs )
Expand Down