Skip to content

[vcpkg|scripts] add configure cache to vcpkg_configure_make #22473

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

Draft
Alexander Neumann (Neumann-A) wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

[vcpkg|scripts] add configure cache to vcpkg_configure_make #22473

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
be03cd9
add configure cache to vcpkg_configure_make
Neumann-A Jan 11, 2022
861829e
update docs.
Neumann-A Jan 13, 2022
c0c32b2
Merge remote-tracking branch 'upstream/master' into make_configure_cache
Neumann-A Jan 27, 2022
642e696
Merge remote-tracking branch 'upstream/master' into make_configure_cache
Apr 1, 2022
4d46720
Merge remote-tracking branch 'upstream/master' into make_configure_cache
Apr 20, 2022
37cdc6b
Merge branch 'microsoft:master' into make_configure_cache
Neumann-A Jun 7, 2022
6ebcb64
Merge remote-tracking branch 'upstream/master' into make_configure_cache
Neumann-A Apr 25, 2024
1ed7a81
use VCPKG_HASH_ADDITIONAL_FILES
Neumann-A Apr 25, 2024
fd7167b
comment out cache in gettext
Neumann-A Apr 25, 2024
405fc96
add cache variables from libiconv
Neumann-A May 1, 2024
bb30e30
add more variables to cache
Neumann-A May 1, 2024
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
13 changes: 9 additions & 4 deletions docs/maintainers/vcpkg_configure_make.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ vcpkg_configure_make(
[USE_WRAPPERS]
[DETERMINE_BUILD_TRIPLET]
[BUILD_TRIPLET "--host=x64 --build=i686-unknown-pc"]
[NO_ADDITIONAL_PATHS]
[NO_ADDITIONAL_PATHS] [NO_CONFIGURE_CACHE]
[CONFIG_DEPENDENT_ENVIRONMENT <SOME_VAR>...]
[CONFIGURE_ENVIRONMENT_VARIABLES <SOME_ENVVAR>...]
[ADD_BIN_TO_PATH]
Expand Down Expand Up @@ -50,6 +50,11 @@ For ports having a configure script following the autotools rules for selecting
### NO_ADDITIONAL_PATHS
Don't pass any additional paths except for --prefix to the configure call

### NO_CONFIGURE_CACHE
Disable the passing of a cache file to configure (--config-cache).
The used cache file is given by the triplet variables `VCPKG_MAKE_CONFIGURE_CACHE(_RELEASE|_DEBUG)?`.
The buildtype dependent values will overwrite the cache without a buildtype.

### AUTOCONFIG
Need to use autoconfig to generate configure file.

Expand All @@ -63,13 +68,13 @@ Adds the appropriate Release and Debug `bin\` directories to the path during con
do not pass '--disable-silent-rules --verbose' to configure

### OPTIONS
Additional options passed to configure during the configuration.
Additional options passed to configure during the configuration. (The triplet can use VCPKG_CONFIGURE_MAKE_OPTIONS to add additional options)

### OPTIONS_RELEASE
Additional options passed to configure during the Release configuration. These are in addition to `OPTIONS`.
Additional options passed to configure during the Release configuration. These are in addition to `OPTIONS`. (The triplet can use VCPKG_CONFIGURE_MAKE_OPTIONS_RELEASE to add additional options)

### OPTIONS_DEBUG
Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`.
Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`. (The triplet can use VCPKG_CONFIGURE_MAKE_OPTIONS_DEBUG to add additional options)

### CONFIG_DEPENDENT_ENVIRONMENT
List of additional configuration dependent environment variables to set.
Expand Down
35 changes: 29 additions & 6 deletions scripts/cmake/vcpkg_configure_make.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ vcpkg_configure_make(
[USE_WRAPPERS]
[DETERMINE_BUILD_TRIPLET]
[BUILD_TRIPLET "--host=x64 --build=i686-unknown-pc"]
[NO_ADDITIONAL_PATHS]
[NO_ADDITIONAL_PATHS] [NO_CONFIGURE_CACHE]
[CONFIG_DEPENDENT_ENVIRONMENT <SOME_VAR>...]
[CONFIGURE_ENVIRONMENT_VARIABLES <SOME_ENVVAR>...]
[ADD_BIN_TO_PATH]
Expand Down Expand Up @@ -49,6 +49,11 @@ For ports having a configure script following the autotools rules for selecting
### NO_ADDITIONAL_PATHS
Don't pass any additional paths except for --prefix to the configure call

### NO_CONFIGURE_CACHE
Disable the passing of a cache file to configure (--config-cache).
The used cache file is given by the triplet variables `VCPKG_MAKE_CONFIGURE_CACHE(_RELEASE|_DEBUG)?`.
The buildtype dependent values will overwrite the cache without a buildtype.

### AUTOCONFIG
Need to use autoconfig to generate configure file.

Expand All @@ -62,13 +67,13 @@ Adds the appropriate Release and Debug `bin\` directories to the path during con
do not pass '--disable-silent-rules --verbose' to configure

### OPTIONS
Additional options passed to configure during the configuration.
Additional options passed to configure during the configuration. (The triplet can use VCPKG_CONFIGURE_MAKE_OPTIONS to add additional options)

### OPTIONS_RELEASE
Additional options passed to configure during the Release configuration. These are in addition to `OPTIONS`.
Additional options passed to configure during the Release configuration. These are in addition to `OPTIONS`. (The triplet can use VCPKG_CONFIGURE_MAKE_OPTIONS_RELEASE to add additional options)

### OPTIONS_DEBUG
Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`.
Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`. (The triplet can use VCPKG_CONFIGURE_MAKE_OPTIONS_DEBUG to add additional options)

### CONFIG_DEPENDENT_ENVIRONMENT
List of additional configuration dependent environment variables to set.
Expand Down Expand Up @@ -228,7 +233,7 @@ 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;NO_DEBUG;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;NO_CONFIGURE_CACHE"
"SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET"
"OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT;ADDITIONAL_MSYS_PACKAGES"
)
Expand Down Expand Up @@ -762,6 +767,24 @@ function(vcpkg_configure_make)
set(relative_build_path .)
endif()

set(configure_cache "")
if(NOT arg_NO_CONFIGURE_CACHE)
set(cache_file "${target_dir}/${TARGET_TRIPLET}-${short_name_${current_buildtype}}.cache")
if(DEFINED VCPKG_MAKE_CONFIGURE_CACHE_${current_buildtype} AND NOT "${VCPKG_MAKE_CONFIGURE_CACHE_${current_buildtype}}" STREQUAL "")
if(NOT EXISTS "${VCPKG_MAKE_CONFIGURE_CACHE_${current_buildtype}}")
message(FATAL_ERROR "VCPKG_MAKE_CONFIGURE_CACHE_${current_buildtype}:'${VCPKG_MAKE_CONFIGURE_CACHE_${current_buildtype}}' needs to be a valid and exisiting file path!")
endif()
file(COPY_FILE "${VCPKG_MAKE_CONFIGURE_CACHE_${current_buildtype}}" "${cache_file}")
set(configure_cache "--cache-file='${cache_file}'")
elseif(DEFINED VCPKG_MAKE_CONFIGURE_CACHE AND NOT "${VCPKG_MAKE_CONFIGURE_CACHE}" STREQUAL "")
if(NOT EXISTS "${VCPKG_MAKE_CONFIGURE_CACHE}")
message(FATAL_ERROR "VCPKG_MAKE_CONFIGURE_CACHE:'${VCPKG_MAKE_CONFIGURE_CACHE}' needs to be a valid and exisiting file path!")
endif()
file(COPY_FILE "${VCPKG_MAKE_CONFIGURE_CACHE}" "${cache_file}")
set(configure_cache "--cache-file='${cache_file}'")
endif()
endif()

# Setup PKG_CONFIG_PATH
set(pkgconfig_installed_dir "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/pkgconfig")
set(pkgconfig_installed_share_dir "${CURRENT_INSTALLED_DIR}/share/pkgconfig")
Expand Down Expand Up @@ -803,7 +826,7 @@ function(vcpkg_configure_make)
endforeach()
unset(lib_env_vars)

set(command "${base_cmd}" -c "${configure_env} ./${relative_build_path}/configure ${arg_BUILD_TRIPLET} ${arg_OPTIONS} ${arg_OPTIONS_${current_buildtype}}")
set(command "${base_cmd}" -c "${configure_env} ./${relative_build_path}/configure ${arg_BUILD_TRIPLET} ${configure_cache} ${arg_OPTIONS} ${arg_OPTIONS_${current_buildtype}}")

if(arg_ADD_BIN_TO_PATH)
set(path_backup $ENV{PATH})
Expand Down
32 changes: 32 additions & 0 deletions scripts/toolchains/windows.configure.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Autoconfig stuff
ac_cv_c_compiler_gnu=no
ac_cv_c_undeclared_builtin_options='none needed'
ac_cv_cxx_compiler_gnu=no
ac_cv_exeext=.exe
ac_cv_objext=obj
ac_cv_func_memmove=yes
ac_cv_func_memset=yes
ac_cv_func_wcslen=yes
ac_cv_func_setlocale=yes
ac_cv_func_strftime=yes
ac_cv_have_decl_snprintf=yes
ac_cv_have_decl_strtoull=yes
ac_cv_header_stdint_h=yes
ac_cv_header_stdio_h=yes
ac_cv_header_stdlib_h=yes
ac_cv_header_string_h=yes
ac_cv_header_sys_stat_h=yes
ac_cv_header_sys_types_h=yes
ac_cv_header_time_h=yes
ac_cv_header_wchar_h=yes
ac_cv_header_windows_h=yes
ac_cv_lib_gdi32_main=yes
ac_cv_sizeof_unsigned_int=4
ac_cv_sizeof_unsigned_long=4
ac_cv_sizeof_void_p=8
ac_cv_type_ssize_t=no
ac_cv_type_wchar_t=yes
# ac_cv_prog_cc_c11='-std:c11' # Requires VS2019 and a recent windows sdk
# Libtool settings
lt_cv_prog_gnu_ld=no

2 changes: 1 addition & 1 deletion triplets/x64-windows.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)

set(VCPKG_MAKE_CONFIGURE_CACHE "${CMAKE_CURRENT_LIST_DIR}/../scripts/toolchains/windows.configure.txt") # ${SCRIPTS} could be used here but the compiler detection does not know about that.