[boost-modular-build-helper] Attempt to pass flags more correctly into b2 #23001
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,18 @@ | ||
| cmake_minimum_required(VERSION 3.9) | ||
| project(boost NONE) | ||
|
|
||
| # The following variables are used in user-config.jam file | ||
| set(USER_CONFIG_TOOLSET "") | ||
| set(USER_CONFIG_TOOLSET_VERSION "") | ||
| set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "") | ||
| set(USER_CONFIG_TOOLSET_OPTIONS "") | ||
| set(USER_CONFIG_EXTRA_LINES "") | ||
| set(USER_CONFIG_REQUIREMENTS "") | ||
|
|
||
| set(B2_OPTIONS) | ||
|
|
||
| include("${VCPKG_CMAKE_VARS_FILE}") | ||
|
|
||
| # Add build type specific options | ||
| if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") | ||
| list(APPEND B2_OPTIONS runtime-link=shared) | ||
|
|
@@ -23,13 +26,13 @@ else() | |
| list(APPEND B2_OPTIONS link=static) | ||
| endif() | ||
|
|
||
| if(VCPKG_DETECTED_CMAKE_SIZEOF_VOID_P EQUAL "8") | ||
| list(APPEND B2_OPTIONS address-model=64) | ||
| else() | ||
| list(APPEND B2_OPTIONS address-model=32) | ||
| endif() | ||
|
|
||
| if(VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x") | ||
| list(APPEND B2_OPTIONS architecture=s390x) | ||
| elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") | ||
| list(APPEND B2_OPTIONS architecture=arm) | ||
|
|
@@ -43,178 +46,103 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND WIN32) | |
| list(APPEND B2_OPTIONS "asmflags=/safeseh") | ||
| endif() | ||
|
|
||
| if(VCPKG_DETECTED_MSVC) | ||
| if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "Clang") | ||
| set(USER_CONFIG_TOOLSET clang-win) | ||
| else() | ||
| set(USER_CONFIG_TOOLSET msvc) | ||
| endif() | ||
| if(VCPKG_DETECTED_MSVC_VERSION LESS "1900") | ||
| math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60") | ||
| else() | ||
| math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 50") | ||
| endif() | ||
| elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "Clang") | ||
| set(USER_CONFIG_TOOLSET clang) | ||
| else() | ||
| set(USER_CONFIG_TOOLSET gcc) | ||
| endif() | ||
|
|
||
| if(WIN32) | ||
ras0219-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| list(APPEND B2_OPTIONS target-os=windows) | ||
| elseif(APPLE) | ||
| list(APPEND B2_OPTIONS target-os=darwin) | ||
| elseif(ANDROID) | ||
| list(APPEND B2_OPTIONS target-os=android) | ||
| else() | ||
| list(APPEND B2_OPTIONS target-os=linux) | ||
| endif() | ||
|
|
||
| # Properly handle compiler and linker flags passed by VCPKG | ||
| string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_BUILD_TYPE) | ||
|
|
||
| set(CXXFLAGS "${VCPKG_COMBINED_CXX_FLAGS_${UPPER_BUILD_TYPE}}") | ||
| set(CFLAGS "${VCPKG_COMBINED_C_FLAGS_${UPPER_BUILD_TYPE}}") | ||
| set(LDFLAGS "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${UPPER_BUILD_TYPE}}") | ||
| set(ARFLAGS "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${UPPER_BUILD_TYPE}}") | ||
|
|
||
| if(APPLE) | ||
ras0219-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| string(APPEND COMPILEFLAGS " -D_DARWIN_C_SOURCE") | ||
| if(NOT CXXFLAGS MATCHES " -std=") | ||
| # If the user hasn't provided their own standard flag, use at least c++11 | ||
| string(APPEND CXXFLAGS " -std=c++11") | ||
| endif() | ||
| endif() | ||
|
|
||
| if(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") | ||
| # cl in b2 appears to not receive `LIBPATH` for finding winmd files, so we transform them to `/AI` options. | ||
| set(libpath_args "$ENV{LIBPATH}") | ||
| # Apply: {x -> /AI"x"} | ||
| list(TRANSFORM libpath_args PREPEND "/AI\"") | ||
| list(TRANSFORM libpath_args APPEND "\"") | ||
| list(JOIN libpath_args " " libpath_arg) | ||
|
|
||
| string(APPEND CXXFLAGS " /ZW") | ||
| string(APPEND COMPILEFLAGS " ${libpath_arg} /D_WIN32_WINNT=0x0A00") | ||
| string(APPEND CFLAGS " -Zl") | ||
| list(APPEND B2_OPTIONS windows-api=store) | ||
| list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) | ||
|
Comment on lines
-192
to
104
There was a problem hiding this comment. Looks like this would partly conflict with the uwp settings in #22831 |
||
| endif() | ||
|
|
||
| set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "\"${VCPKG_DETECTED_CMAKE_CXX_COMPILER}\"") | ||
|
|
||
| string(APPEND CXXFLAGS "${COMPILEFLAGS}") | ||
| string(APPEND CFLAGS "${COMPILEFLAGS}") | ||
|
|
||
| foreach(var CXXFLAGS CFLAGS LDFLAGS ARFLAGS) | ||
| string(REPLACE [[\]] [[\\]] ${var} "${${var}}") | ||
| string(REPLACE [["]] [[\"]] ${var} "${${var}}") | ||
| string(REGEX REPLACE "[ \t\r\n]+" " " ${var} "${${var}}") | ||
| string(STRIP "${${var}}" ${var}) | ||
| endforeach() | ||
|
|
||
| if(USER_CONFIG_TOOLSET STREQUAL "msvc") | ||
| file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT) | ||
| string(APPEND USER_CONFIG_TOOLSET_OPTIONS | ||
| " <setup>\"${NOTHING_BAT}\"\n" | ||
| ) | ||
| if(NOT ARFLAGS STREQUAL "") | ||
| # Only apply these flags for MSVC | ||
| string(APPEND USER_CONFIG_REQUIREMENTS "<archiveflags>\"${ARFLAGS}\"\n ") | ||
| endif() | ||
| else() | ||
| string(APPEND USER_CONFIG_TOOLSET_OPTIONS | ||
| " <ranlib>\"${VCPKG_DETECTED_CMAKE_RANLIB}\"\n" | ||
| " <archiver>\"${VCPKG_DETECTED_CMAKE_AR}\"\n" | ||
| ) | ||
| endif() | ||
|
|
||
| if(NOT CXXFLAGS STREQUAL "") | ||
ras0219-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| string(APPEND USER_CONFIG_TOOLSET_OPTIONS " <cxxflags>\"${CXXFLAGS}\"\n") | ||
| endif() | ||
| if(NOT CFLAGS STREQUAL "") | ||
| string(APPEND USER_CONFIG_TOOLSET_OPTIONS " <cflags>\"${CFLAGS}\"\n <asmflags>\"${CFLAGS}\"\n") | ||
| endif() | ||
| if(NOT LDFLAGS STREQUAL "") | ||
| string(APPEND USER_CONFIG_REQUIREMENTS "<linkflags>\"${LDFLAGS}\"\n ") | ||
| string(APPEND USER_CONFIG_TOOLSET_OPTIONS " <linkflags>\"${LDFLAGS}\"\n") | ||
| endif() | ||
|
|
||
| if(WIN32 AND NOT USER_CONFIG_TOOLSET STREQUAL "msvc") | ||
| # MINGW here causes b2 to not run cygpath | ||
| string(APPEND USER_CONFIG_TOOLSET_OPTIONS | ||
|
|
@@ -255,7 +183,7 @@ endif() | |
| # Handle Python | ||
| set(python_versions "") | ||
|
|
||
| if(WITH_PYTHON2) | ||
| # Find Python2 in the current installed directory | ||
| file(GLOB python2_include_dir "${CURRENT_INSTALLED_DIR}/include/python2.*") | ||
| string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python2_version "${python2_include_dir}") | ||
|
|
@@ -266,7 +194,7 @@ if("python2" IN_LIST FEATURES) | |
| list(APPEND python_versions "${python2_version}") | ||
| endif() | ||
|
|
||
| if(WITH_PYTHON3) | ||
| # Find Python3 in the current installed directory | ||
| file(GLOB python3_include_dir "${CURRENT_INSTALLED_DIR}/include/python3.*") | ||
| string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python3_version "${python3_include_dir}") | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This variable is not set. (And why no longer
CMAKE_SIZEOF_VOID_P)?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Anwer to the question: No languages enabled here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
... because I didn't update
vcpkg-cmakeat the same time.Why can't we use
version>=for such dependencies?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
manifest mode would have automatically reinstalled here. Just always start from scratch if you use classic mode and do git operations.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
... unless I (the user) would pin a different version. That's why I think it is useful to make the versioned dependencies explicit.