diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json index 59046f78a10ecc..ecf88b73a2239a 100644 --- a/ports/vcpkg-make/vcpkg.json +++ b/ports/vcpkg-make/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-make", - "version-date": "2024-12-27", + "version-date": "2025-01-13", "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure", "license": null, "supports": "native", diff --git a/ports/vcpkg-make/vcpkg_make.cmake b/ports/vcpkg-make/vcpkg_make.cmake index ee3ec778fce9b2..757b2bd7fdf565 100644 --- a/ports/vcpkg-make/vcpkg_make.cmake +++ b/ports/vcpkg-make/vcpkg_make.cmake @@ -53,7 +53,7 @@ function(vcpkg_run_shell_as_build) "SHELL;COMMAND;NO_PARALLEL_COMMAND;SAVE_LOG_FILES" ) z_vcpkg_unparsed_args(FATAL_ERROR) - z_vcpkg_required_args(SHELL WORKINK_DIRECTORY COMMAND LOGNAME) + z_vcpkg_required_args(SHELL WORKING_DIRECTORY COMMAND LOGNAME) set(extra_opts "") if(arg_SAVE_LOG_FILES) @@ -62,9 +62,12 @@ function(vcpkg_run_shell_as_build) list(JOIN arg_COMMAND " " cmd) list(JOIN arg_NO_PARALLEL_COMMAND " " no_par_cmd) + if(NOT no_par_cmd STREQUAL "") + set(no_par_cmd NO_PARALLEL_COMMAND ${arg_SHELL} -c "${no_par_cmd}") + endif() vcpkg_execute_build_process( COMMAND ${arg_SHELL} -c "${cmd}" - NO_PARALLEL_COMMAND ${arg_SHELL} -c "${no_par_cmd}" + ${no_par_cmd} WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" LOGNAME "${arg_LOGNAME}" ${extra_opts} diff --git a/ports/vcpkg-make/vcpkg_make_common.cmake b/ports/vcpkg-make/vcpkg_make_common.cmake index 575f3b81f8089d..8e7c4933f59be9 100644 --- a/ports/vcpkg-make/vcpkg_make_common.cmake +++ b/ports/vcpkg-make/vcpkg_make_common.cmake @@ -11,7 +11,7 @@ macro(z_vcpkg_make_set_common_vars) endforeach() set(buildtypes release) if(NOT VCPKG_BUILD_TYPE) - list(APPEND buildtypes debug) + list(PREPEND buildtypes debug) endif() endmacro() @@ -557,7 +557,6 @@ function(z_vcpkg_make_prepare_flags) ${flags_opts} ) if(NOT DEFINED VCPKG_BUILD_TYPE) - list(APPEND all_buildtypes DEBUG) z_vcpkg_make_prepare_compile_flags( CONFIG DEBUG COMPILER_FRONTEND "${VCPKG_DETECTED_CMAKE_C_COMPILER_FRONTEND_VARIANT}" diff --git a/ports/vcpkg-make/vcpkg_make_configure.cmake b/ports/vcpkg-make/vcpkg_make_configure.cmake index d58200fdc1dd0f..57ce70d9333684 100644 --- a/ports/vcpkg-make/vcpkg_make_configure.cmake +++ b/ports/vcpkg-make/vcpkg_make_configure.cmake @@ -97,7 +97,6 @@ function(vcpkg_make_configure) set(opts "") if(NOT arg_DISABLE_DEFAULT_OPTIONS) z_vcpkg_make_default_path_and_configure_options(opts AUTOMAKE CONFIG "${configup}") - vcpkg_list(APPEND arg_OPTIONS ${opts}) endif() set(configure_path_from_wd "./${relative_build_path}/configure") @@ -116,7 +115,8 @@ function(vcpkg_make_configure) "${configure_path_from_wd}" OPTIONS ${BUILD_TRIPLET} - ${arg_OPTIONS} + ${arg_OPTIONS} + ${opts} ${arg_OPTIONS_${configup}} WORKING_DIRECTORY "${target_dir}" diff --git a/ports/vcpkg-make/vcpkg_make_install.cmake b/ports/vcpkg-make/vcpkg_make_install.cmake index 76bfae405193e2..00b39416f785ef 100644 --- a/ports/vcpkg-make/vcpkg_make_install.cmake +++ b/ports/vcpkg-make/vcpkg_make_install.cmake @@ -4,8 +4,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make.cmake") function(vcpkg_make_install) cmake_parse_arguments(PARSE_ARGV 0 arg "DISABLE_PARALLEL" - "LOGFILE_ROOT;MAKEFILE;TARGETS" - "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" + "LOGFILE_ROOT;MAKEFILE" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;TARGETS" ) z_vcpkg_unparsed_args(FATAL_ERROR) @@ -81,26 +81,27 @@ function(vcpkg_make_install) endif() foreach(target IN LISTS arg_TARGETS) + string(REPLACE "/" "_" target_no_slash "${target}") vcpkg_list(SET make_cmd_line ${make_command} ${arg_OPTIONS} ${arg_OPTIONS_${cmake_buildtype}} V=1 -j ${VCPKG_CONCURRENCY} ${extra_opts} -f ${arg_MAKEFILE} ${target} ${destdir_opt}) vcpkg_list(SET no_parallel_make_cmd_line ${make_command} ${arg_OPTIONS} ${arg_OPTIONS_${cmake_buildtype}} V=1 -j 1 ${extra_opts} -f ${arg_MAKEFILE} ${target} ${destdir_opt}) message(STATUS "Making target '${target}' for ${TARGET_TRIPLET}-${short_buildtype}") if (arg_DISABLE_PARALLEL) vcpkg_run_shell_as_build( WORKING_DIRECTORY "${working_directory}" - LOGNAME "${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}" + LOGNAME "${arg_LOGFILE_ROOT}-${target_no_slash}-${TARGET_TRIPLET}-${short_buildtype}" SHELL ${shell_cmd} - NO_PARALLEL_COMMAND ${configure_env} ${no_parallel_make_cmd_line} + COMMAND ${configure_env} ${no_parallel_make_cmd_line} ) else() vcpkg_run_shell_as_build( WORKING_DIRECTORY "${working_directory}" - LOGNAME "${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}" + LOGNAME "${arg_LOGFILE_ROOT}-${target_no_slash}-${TARGET_TRIPLET}-${short_buildtype}" SHELL ${shell_cmd} - COMMAND ${configure_env} ${no_parallel_make_cmd_line} + COMMAND ${configure_env} ${make_cmd_line} NO_PARALLEL_COMMAND ${configure_env} ${no_parallel_make_cmd_line} ) endif() - file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}-out.log" logdata) + file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${target_no_slash}-${TARGET_TRIPLET}-${short_buildtype}-out.log" logdata) if(logdata MATCHES "Warning: linker path does not have real file for library") message(FATAL_ERROR "libtool could not find a file being linked against!") endif() diff --git a/versions/baseline.json b/versions/baseline.json index ae7edec66224fa..c6f0fe106175d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9405,7 +9405,7 @@ "port-version": 0 }, "vcpkg-make": { - "baseline": "2024-12-27", + "baseline": "2025-01-13", "port-version": 0 }, "vcpkg-msbuild": { diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json index 960c6a0c986d65..a840346820ff3b 100644 --- a/versions/v-/vcpkg-make.json +++ b/versions/v-/vcpkg-make.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5af3456c1f7742c9d880d70dc678c061b91668c1", + "version-date": "2025-01-13", + "port-version": 0 + }, { "git-tree": "ac1381c26cff8ab8365670f4fb00395e86c58dfa", "version-date": "2024-12-27",