Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Improve integration with vcpkg
  • Loading branch information
hkaiser committed May 29, 2017
1 parent 47e122e commit 6ae2418
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions cmake/HPX_SetupBoost.cmake
Expand Up @@ -131,8 +131,7 @@ if(MSVC)
hpx_option(HPX_WITH_BOOST_ALL_DYNAMIC_LINK BOOL
"Add BOOST_ALL_DYN_LINK to compile flags (default: OFF)"
OFF ADVANCED)
if (HPX_WITH_BOOST_ALL_DYNAMIC_LINK OR HPX_WITH_VCPKG)
set(HPX_WITH_BOOST_ALL_DYNAMIC_LINK ON)
if (HPX_WITH_BOOST_ALL_DYNAMIC_LINK)
hpx_add_config_cond_define(BOOST_ALL_DYN_LINK)
endif()
else()
Expand All @@ -149,7 +148,7 @@ endif()

include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
if((NOT MSVC) OR HPX_WITH_BOOST_ALL_DYNAMIC_LINK)
if((NOT MSVC) OR HPX_WITH_BOOST_ALL_DYNAMIC_LINK OR HPX_WITH_VCPKG)
hpx_libraries(${Boost_LIBRARIES})
else()
hpx_library_dir(${Boost_LIBRARY_DIRS})
Expand Down

0 comments on commit 6ae2418

Please sign in to comment.