Skip to content

[boost-modular-build-helper] Ensure CMAKE_STATIC_LINKER_FLAGS makes it to the link.exe command line when building Boost as a static lib with MSVC. #20697

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

Closed
PDeets wants to merge 3 commits into from
Closed

[boost-modular-build-helper] Ensure CMAKE_STATIC_LINKER_FLAGS makes it to the link.exe command line when building Boost as a static lib with MSVC. #20697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f143643
Ensure CMAKE_STATIC_LINKER_FLAGS makes it to the link.exe command lin…
PDeets Feb 1, 2022
41460bf
Check in result of vcpkg x-add-version --all.
PDeets Feb 1, 2022
3789ed5
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Feb 8, 2022
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
7 changes: 7 additions & 0 deletions ports/boost-modular-build-helper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,13 @@ string(STRIP "${CFLAGS}" CFLAGS)
string(REGEX REPLACE "[ \t\r\n]+" " " LDFLAGS "${LDFLAGS}")
string(STRIP "${LDFLAGS}" LDFLAGS)

# When building a static lib with MSVC, you need to use archiveflags instead of linkflags.
# This is set via the b2 command line since putting <archiveflags> in the user-config.jam
# file doesn't seem to work like it does for <linkflags>.
if(MSVC AND NOT BUILD_SHARED_LIBS)
list(APPEND B2_OPTIONS "\"archiveflags=${LDFLAGS}\"")
endif()

if(NOT CXXFLAGS STREQUAL "")
string(REPLACE " " " <cxxflags>" CXXFLAGS "<cxxflags>${CXXFLAGS}")
endif()
Expand Down
2 changes: 1 addition & 1 deletion ports/boost-modular-build-helper/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "boost-modular-build-helper",
"version": "1.78.0",
"port-version": 2,
"port-version": 3,
"description": "Internal vcpkg port used to build Boost libraries",
"dependencies": [
"boost-uninstall",
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/boost-modular-build-helper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4211622aebc0f2bbaaee3edab6dcbc755d1cac26",
"version": "1.78.0",
"port-version": 3
},
{
"git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6",
"version": "1.78.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@
},
"boost-modular-build-helper": {
"baseline": "1.78.0",
"port-version": 2
"port-version": 3
},
"boost-move": {
"baseline": "1.78.0",
Expand Down