Skip to content

[vcpkg_configure_make] Report warning when unresolved arguments are passed in #22567

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

Merged
Victor Romero (vicroms) merged 11 commits into from
Mar 2, 2022
Merged

[vcpkg_configure_make] Report warning when unresolved arguments are passed in #22567

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e214da9
[vcpkg_configure_make] Report warning when unresolved arguments are p…
Jan 17, 2022
58a8e23
Add missing option NO_DEBUG
Jan 19, 2022
07d69c5
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Feb 17, 2022
1bfa065
Add _VCPKG_MAKE_NO_DEBUG for vcpkg_configure_make
Feb 17, 2022
2a2d6d2
Add more condition
Feb 17, 2022
ec1f65a
[apr] Remove NO_DEBUG
Feb 18, 2022
e5c0cb9
[liburing] Remove NO_DEBUG
Feb 18, 2022
417473b
[apr-util] Remove NO_DEBUG
Feb 18, 2022
849acc7
version
Feb 18, 2022
eedd2d3
Mssing port-version ++
Feb 18, 2022
54137b4
version
Feb 18, 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
4 changes: 4 additions & 0 deletions scripts/cmake/vcpkg_build_make.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ function(vcpkg_build_make)
vcpkg_backup_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS)

foreach(buildtype IN ITEMS "debug" "release")
if (buildtype STREQUAL "debug" AND _VCPKG_MAKE_NO_DEBUG)
continue()
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}")
if("${buildtype}" STREQUAL "debug")
set(short_buildtype "-dbg")
Expand Down Expand Up @@ -251,4 +254,5 @@ function(vcpkg_build_make)
endif()

vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS)
unset(_VCPKG_MAKE_NO_DEBUG PARENT_SCOPE)
endfunction()
7 changes: 6 additions & 1 deletion scripts/cmake/vcpkg_configure_make.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,15 @@ endmacro()
function(vcpkg_configure_make)
# parse parameters such that semicolons in options arguments to COMMAND don't get erased
cmake_parse_arguments(PARSE_ARGV 0 arg
"AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET"
"AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;NO_DEBUG;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET"

@JackBoosY Jack·Boos·Yu (JackBoosY) Jan 19, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NO_DEBUG is used below but is not declare here.

@dg0yt Kai Pastor (dg0yt) Jan 19, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And it is not documented.

@Neumann-A Alexander Neumann (Neumann-A) Feb 17, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is NO_DEBUG used anywhere ? Couldn't the same be achieved by setting VCPKG_BUILD_TYPE before the command?

@JackBoosY Jack·Boos·Yu (JackBoosY) Feb 17, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alexander Neumann (@Neumann-A) See

vcpkg/ports/liburing/portfile.cmake

Lines 13 to 17 in f54a7b0

vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
COPY_SOURCE
NO_DEBUG
)

@JackBoosY Jack·Boos·Yu (JackBoosY) Feb 18, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I suddenly realized that this option has no effect now unless the makefile doesn't support debug mode.

"SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET"
"OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT;ADDITIONAL_MSYS_PACKAGES"
)

if(DEFINED arg_UNPARSED_ARGUMENTS)
message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
endif()

z_vcpkg_get_cmake_vars(cmake_vars_file)
debug_message("Including cmake vars from: ${cmake_vars_file}")
include("${cmake_vars_file}")
Expand Down Expand Up @@ -866,4 +870,5 @@ function(vcpkg_configure_make)

set(_VCPKG_PROJECT_SOURCE_PATH ${arg_SOURCE_PATH} PARENT_SCOPE)
set(_VCPKG_PROJECT_SUBPATH ${arg_PROJECT_SUBPATH} PARENT_SCOPE)
set(_VCPKG_MAKE_NO_DEBUG ${arg_NO_DEBUG} PARENT_SCOPE)
endfunction()