From 57bd7102d9fd880daa1b0958692294c4a125f6d8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 7 Aug 2021 16:48:44 +0200 Subject: [vcpkg baseline][vcpkg_configure_make] Pass make tool to `vcpkg_build_make` (#19361) * Pass 'make' between vcpkg scripts * Restore original BSD gmake lookup * [starlink-ast] Add ADDITIONAL_MSYS_PACKAGES to vcpkg_configure_make * [starlink-ast] x-add-version Co-authored-by: JackBoosY --- scripts/cmake/vcpkg_build_make.cmake | 17 ++++++++--------- scripts/cmake/vcpkg_configure_make.cmake | 9 +++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 30b073c50..18f857fce 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -81,15 +81,16 @@ function(vcpkg_build_make) string(REPLACE " " "\ " _VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") endif() - set(MAKE ) set(MAKE_OPTS ) set(INSTALL_OPTS ) if (CMAKE_HOST_WIN32) set(PATH_GLOBAL "$ENV{PATH}") vcpkg_add_to_path(PREPEND "${SCRIPTS}/buildsystems/make_wrapper") - vcpkg_acquire_msys(MSYS_ROOT) - find_program(MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED) - set(MAKE_COMMAND "${MAKE}") + if(NOT DEFINED Z_VCPKG_MAKE) + vcpkg_acquire_msys(MSYS_ROOT) + find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED) + endif() + set(MAKE_COMMAND "${Z_VCPKG_MAKE}") set(MAKE_OPTS ${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} -j 1 --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) @@ -98,14 +99,12 @@ function(vcpkg_build_make) set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${_VCPKG_PACKAGE_PREFIX}) #TODO: optimize for install-data (release) and install-exec (release/debug) else() - # Compiler requriements if(VCPKG_HOST_IS_OPENBSD) - find_program(MAKE gmake REQUIRED) + find_program(Z_VCPKG_MAKE gmake REQUIRED) else() - find_program(MAKE make REQUIRED) + find_program(Z_VCPKG_MAKE make REQUIRED) endif() - set(MAKE_COMMAND "${MAKE}") - # Set make command and install command + set(MAKE_COMMAND "${Z_VCPKG_MAKE}") set(MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j 1 -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${CURRENT_PACKAGES_DIR}) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index f9a042660..067bf4da0 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -861,6 +861,15 @@ function(vcpkg_configure_make) endforeach() endforeach() + # Export matching make program for vcpkg_build_make (cache variable) + if(CMAKE_HOST_WIN32 AND MSYS_ROOT) + find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED) + elseif(VCPKG_HOST_IS_OPENBSD) + find_program(Z_VCPKG_MAKE gmake REQUIRED) + else() + find_program(Z_VCPKG_MAKE make REQUIRED) + endif() + # Restore environment _vcpkg_restore_env_variables(${_cm_FLAGS} LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) -- cgit v1.2.3