Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CMake/External_Boost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ ExternalProject_Add(Boost
PATCH_COMMAND
${Boost_PATCH_COMMAND}
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-DCMAKE_BUILD_TYPE=$<CONFIGURATION>
-DCMAKE_VARS_FILE=${fletch_BUILD_PREFIX}/tmp/Boost/CMakeVars.cmake
-DBoost_EXTRA_LIBS=${fletch_EXTRA_BOOST_LIBS}
${_Boost_DIR_ARGS}
Expand Down
8 changes: 7 additions & 1 deletion Patches/Boost/Configure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,19 @@ execute_command_wrapper(
${BOOTSTRAP} ${BOOTSTRAP_ARGS}
)

string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE)
if(NOT CMAKE_BUILD_TYPE STREQUAL "debug") # adjust for relwithdebinfo
set(CMAKE_BUILD_TYPE "release")
endif()
message("Boost.Configure.BCP.Build: Using variant=${CMAKE_BUILD_TYPE}")

# Note: BCP has known issues with some msvc release builds so we always build
# it in debug.
execute_command_wrapper(
"Boost.Configure.BCP.Build"
${Boost_SOURCE_DIR}/tools/bcp
${Boost_SOURCE_DIR}/b2${CMAKE_EXECUTABLE_SUFFIX}
variant=debug ${B2_ARGS}
variant=${CMAKE_BUILD_TYPE} ${B2_ARGS}
)

execute_command_wrapper(
Expand Down