Skip to content

Commit

Permalink
Improve integration with vcpkg package manager
Browse files Browse the repository at this point in the history
- this allows to build HPX outside of vcpkg while still relying on its
  package repository for Boost and hwloc
  • Loading branch information
hkaiser committed Jun 7, 2017
1 parent ad575fd commit cbb3bce
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,13 @@ endif()

# Adjust a couple of build-system settings, if HPX is to be built using vcpkg
if(MSVC)
set(_with_vcpkg_default OFF)
if(VCPKG_TOOLCHAIN)
set(_with_vcpkg_default ON)
endif()
hpx_option(HPX_WITH_VCPKG BOOL
"Build HPX in the context of the vcpkg build and configuration tool (default: OFF)."
OFF ADVANCED)
${_with_vcpkg_default} ADVANCED)
if(HPX_WITH_VCPKG)
hpx_add_config_define(HPX_HAVE_VCPKG)
endif()
Expand Down

0 comments on commit cbb3bce

Please sign in to comment.