3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-29 03:34:26 +08:00
Code Issues Projects Releases Wiki Activity

Add AUTOCONF support with vcpkg_configure_make. (#8610)

Browse Source
This commit is contained in:
JackBoosY 2019-10-22 07:23:23 +08:00 committed by Victor Romero
parent 6e30ee1ae8
commit b99d073412
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
scripts/cmake/vcpkg_configure_make.cmake
View File

@ -102,10 +102,6 @@ function(vcpkg_configure_make)
else() else()
message(FATAL_ERROR "${_csc_GENERATOR} not supported.") message(FATAL_ERROR "${_csc_GENERATOR} not supported.")
endif() endif()
if (_csc_AUTOCONFIG AND NOT CMAKE_HOST_WIN32)
find_program(autoreconf autoreconf REQUIRED)
endif()
set(WIN_TARGET_ARCH ) set(WIN_TARGET_ARCH )
set(WIN_TARGET_COMPILER ) set(WIN_TARGET_COMPILER )
@ -123,7 +119,11 @@ function(vcpkg_configure_make)
if (CMAKE_HOST_WIN32) if (CMAKE_HOST_WIN32)
vcpkg_find_acquire_program(YASM) vcpkg_find_acquire_program(YASM)
vcpkg_find_acquire_program(PERL) vcpkg_find_acquire_program(PERL)
vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils) set(MSYS_REQUIRE_PACKAGES diffutils)
if (_csc_AUTOCONFIG)
set(MSYS_REQUIRE_PACKAGES ${MSYS_REQUIRE_PACKAGES} autoconf automake m4 libtool perl)
endif()
vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${MSYS_REQUIRE_PACKAGES})
get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
@ -139,6 +139,8 @@ function(vcpkg_configure_make)
set(WIN_TARGET_COMPILER CC=cl) set(WIN_TARGET_COMPILER CC=cl)
set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;${PERL_EXE_PATH}") set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;${PERL_EXE_PATH}")
set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
elseif (_csc_AUTOCONFIG)
find_program(autoreconf autoreconf REQUIRED)
endif() endif()
if (NOT _csc_NO_DEBUG) if (NOT _csc_NO_DEBUG)
@ -253,11 +255,19 @@ function(vcpkg_configure_make)
if (_csc_AUTOCONFIG) if (_csc_AUTOCONFIG)
message(STATUS "Generating configure with ${TARGET_TRIPLET}-dbg") message(STATUS "Generating configure with ${TARGET_TRIPLET}-dbg")
vcpkg_execute_required_process( if (CMAKE_HOST_WIN32)
COMMAND autoreconf -vfi vcpkg_execute_required_process(
WORKING_DIRECTORY ${PRJ_DIR} COMMAND ${base_cmd} autoreconf -vfi
LOGNAME prerun-${TARGET_TRIPLET}-dbg WORKING_DIRECTORY ${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH}
) LOGNAME prerun-${TAR_TRIPLET_DIR}
)
else()
vcpkg_execute_required_process(
COMMAND autoreconf -vfi
WORKING_DIRECTORY ${PRJ_DIR}
LOGNAME prerun-${TAR_TRIPLET_DIR}
)
endif()
endif() endif()
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
@ -318,11 +328,19 @@ function(vcpkg_configure_make)
if (_csc_AUTOCONFIG) if (_csc_AUTOCONFIG)
message(STATUS "Generating configure with ${TAR_TRIPLET_DIR}") message(STATUS "Generating configure with ${TAR_TRIPLET_DIR}")
vcpkg_execute_required_process( if (CMAKE_HOST_WIN32)
COMMAND autoreconf -vfi vcpkg_execute_required_process(
WORKING_DIRECTORY ${PRJ_DIR} COMMAND ${base_cmd} autoreconf -vfi
LOGNAME prerun-${TAR_TRIPLET_DIR} WORKING_DIRECTORY ${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH}
) LOGNAME prerun-${TAR_TRIPLET_DIR}
)
else()
vcpkg_execute_required_process(
COMMAND autoreconf -vfi
WORKING_DIRECTORY ${PRJ_DIR}
LOGNAME prerun-${TAR_TRIPLET_DIR}
)
endif()
endif() endif()
message(STATUS "Configuring ${TAR_TRIPLET_DIR}") message(STATUS "Configuring ${TAR_TRIPLET_DIR}")