Skip to content

Commit

Permalink
Fix EP_Add arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
davisp committed Feb 13, 2024
1 parent 91ebc38 commit 7ef8d09
Showing 1 changed file with 20 additions and 15 deletions.
35 changes: 20 additions & 15 deletions cmake/Modules/FindBoost_EP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -85,24 +85,29 @@ if (NOT BOOST_FOUND)
set(BOOST_LIB_DIR ${boost_INSTALL}/lib)

if (WIN32)
set(boost_CONFIGURE_COMMAND "bootstrap --with-libraries=container --prefix=${boost_INSTALL}")
set(boost_BUILD_COMMAND ".\\b2 -d0 install link=statu variant=release threading=multi runtime-link=static")
ExternalProject_Add(ep_boost
PREFIX boost
URL ${boost_URL}
URL_HASH SHA256=${boost_SHA256}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND bootstrap --with-libraries=container --prefix=${boost_INSTALL}
BUILD_COMMAND .\b2 -d0 install link=statu variant=release threading=multi runtime-link=static
INSTALL_COMMAND ""
INSTALL_DIR ${boost_INSTALL}
)
else()
set(boost_CONFIGURE_COMMAND "./bootstrap.sh --with-libraries=container --prefix=${boost_INSTALL}")
set(boost_BUILD_COMMAND "./b2 -d0 install link=statu variant=release threading=multi runtime-link=static")
ExternalProject_Add(ep_boost
PREFIX boost
URL ${boost_URL}
URL_HASH SHA256=${boost_SHA256}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ./bootstrap.sh --with-libraries=container --prefix=${boost_INSTALL}
BUILD_COMMAND ./b2 -d0 install link=statu variant=release threading=multi runtime-link=static
INSTALL_COMMAND ""
INSTALL_DIR ${boost_INSTALL}
)
endif()

ExternalProject_Add(ep_boost
PREFIX boost
URL ${boost_URL}
URL_HASH SHA256=${boost_SHA256}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ${boost_CONFIGURE_COMMAND}
BUILD_COMMAND ${boost_BUILD_COMMAND}
INSTALL_COMMAND ""
INSTALL_DIR ${boost_INSTALL}
)

list(APPEND FORWARD_EP_CMAKE_ARGS -DTILEDB_BOOST_EP_BUILT=TRUE)
list(APPEND TILEDB_EXTERNAL_PROJECTS ep_boost)
else()
Expand Down

0 comments on commit 7ef8d09

Please sign in to comment.