cmake: Wrap vcpkg code in a function.
Wrap the main body of code in Set-Toolchain-vcpkg.cmake in the vcpkg_set_toolchain() function to not pollute the global variable namespace with helper variables. VCPKG_ROOT and toolchain variables are set in the cache. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
parent
47880ff9c6
commit
5cc1fd28b4
|
@ -1,10 +1,14 @@
|
|||
macro(vcpkg_check_git_status)
|
||||
if(NOT vcpkg_git_status EQUAL 0)
|
||||
if(NOT DEFINED VCPKG_TARGET_TRIPLET)
|
||||
return()
|
||||
endif()
|
||||
|
||||
function(vcpkg_check_git_status git_status)
|
||||
if(NOT git_status EQUAL 0)
|
||||
message(FATAL_ERROR "Error updating vcpkg from git, please make sure git for windows is installed correctly, it can be installed from Visual Studio components")
|
||||
endif()
|
||||
endmacro()
|
||||
endfunction()
|
||||
|
||||
function(vcpkg_get_first_upgrade)
|
||||
function(vcpkg_get_first_upgrade vcpkg_exe)
|
||||
# First get the list of upgraded ports.
|
||||
execute_process(
|
||||
COMMAND ${vcpkg_exe} upgrade
|
||||
|
@ -18,17 +22,14 @@ function(vcpkg_get_first_upgrade)
|
|||
|
||||
foreach(line ${upgrade_lines})
|
||||
if(${line} MATCHES "^ [* ] ")
|
||||
string(REGEX REPLACE "^ [* ] " "" vcpkg_first_upgrade ${line})
|
||||
set(vcpkg_first_upgrade ${vcpkg_first_upgrade} PARENT_SCOPE)
|
||||
string(REGEX REPLACE "^ [* ] " "" first_upgrade ${line})
|
||||
set(first_upgrade ${first_upgrade} PARENT_SCOPE)
|
||||
return()
|
||||
endif()
|
||||
endforeach()
|
||||
endfunction()
|
||||
|
||||
if(NOT DEFINED VCPKG_TARGET_TRIPLET)
|
||||
return()
|
||||
endif()
|
||||
|
||||
function(vcpkg_set_toolchain)
|
||||
if(NOT DEFINED ENV{VCPKG_ROOT})
|
||||
if(WIN32)
|
||||
if(DEFINED ENV{CI} OR EXISTS /vcpkg)
|
||||
|
@ -47,16 +48,18 @@ else()
|
|||
set(VCPKG_ROOT $ENV{VCPKG_ROOT})
|
||||
endif()
|
||||
|
||||
set(VCPKG_ROOT ${VCPKG_ROOT} CACHE FILEPATH "vcpkg installation root path" FORCE)
|
||||
|
||||
if(NOT EXISTS ${VCPKG_ROOT})
|
||||
get_filename_component(vcpkg_root_parent ${VCPKG_ROOT}/.. ABSOLUTE)
|
||||
get_filename_component(root_parent ${VCPKG_ROOT}/.. ABSOLUTE)
|
||||
|
||||
execute_process(
|
||||
COMMAND git clone https://github.com/microsoft/vcpkg.git
|
||||
RESULT_VARIABLE vcpkg_git_status
|
||||
WORKING_DIRECTORY ${vcpkg_root_parent}
|
||||
RESULT_VARIABLE git_status
|
||||
WORKING_DIRECTORY ${root_parent}
|
||||
)
|
||||
|
||||
vcpkg_check_git_status()
|
||||
vcpkg_check_git_status(${git_status})
|
||||
else()
|
||||
# this is the case when we cache vcpkg/installed with the appveyor build cache
|
||||
if(NOT EXISTS ${VCPKG_ROOT}/.git)
|
||||
|
@ -72,50 +75,50 @@ else()
|
|||
|
||||
execute_process(
|
||||
COMMAND ${git_command}
|
||||
RESULT_VARIABLE vcpkg_git_status
|
||||
RESULT_VARIABLE git_status
|
||||
WORKING_DIRECTORY ${VCPKG_ROOT}
|
||||
)
|
||||
|
||||
vcpkg_check_git_status()
|
||||
vcpkg_check_git_status(${git_status})
|
||||
endforeach()
|
||||
else()
|
||||
execute_process(
|
||||
COMMAND git fetch origin
|
||||
RESULT_VARIABLE vcpkg_git_status
|
||||
RESULT_VARIABLE git_status
|
||||
WORKING_DIRECTORY ${VCPKG_ROOT}
|
||||
)
|
||||
vcpkg_check_git_status()
|
||||
vcpkg_check_git_status(${git_status})
|
||||
|
||||
execute_process(
|
||||
COMMAND git status
|
||||
RESULT_VARIABLE vcpkg_git_status
|
||||
RESULT_VARIABLE git_status
|
||||
OUTPUT_VARIABLE git_status_text
|
||||
WORKING_DIRECTORY ${VCPKG_ROOT}
|
||||
)
|
||||
vcpkg_check_git_status()
|
||||
vcpkg_check_git_status(${git_status})
|
||||
|
||||
set(vcpkg_git_up_to_date FALSE)
|
||||
set(git_up_to_date FALSE)
|
||||
|
||||
if(git_status_text MATCHES "Your branch is up to date with")
|
||||
set(vcpkg_git_up_to_date TRUE)
|
||||
set(git_up_to_date TRUE)
|
||||
endif()
|
||||
|
||||
if(NOT vcpkg_git_up_to_date)
|
||||
if(NOT git_up_to_date)
|
||||
execute_process(
|
||||
COMMAND git pull --rebase
|
||||
RESULT_VARIABLE vcpkg_git_status
|
||||
RESULT_VARIABLE git_status
|
||||
WORKING_DIRECTORY ${VCPKG_ROOT}
|
||||
)
|
||||
|
||||
vcpkg_check_git_status()
|
||||
vcpkg_check_git_status(${git_status})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
vcpkg_check_git_status()
|
||||
vcpkg_check_git_status(${git_status})
|
||||
endif()
|
||||
|
||||
# build latest vcpkg, if needed
|
||||
if(NOT vcpkg_git_up_to_date)
|
||||
if(NOT git_up_to_date)
|
||||
if(WIN32)
|
||||
execute_process(
|
||||
COMMAND bootstrap-vcpkg.bat
|
||||
|
@ -152,11 +155,11 @@ execute_process(
|
|||
)
|
||||
|
||||
# If ports have been updated, rebuild cache one at a time to not overrun the CI time limit.
|
||||
vcpkg_get_first_upgrade()
|
||||
vcpkg_get_first_upgrade(${vcpkg_exe})
|
||||
|
||||
if(DEFINED vcpkg_first_upgrade)
|
||||
if(DEFINED first_upgrade)
|
||||
execute_process(
|
||||
COMMAND ${vcpkg_exe} upgrade --no-dry-run ${vcpkg_first_upgrade}
|
||||
COMMAND ${vcpkg_exe} upgrade --no-dry-run ${first_upgrade}
|
||||
WORKING_DIRECTORY ${VCPKG_ROOT}
|
||||
)
|
||||
endif()
|
||||
|
@ -172,5 +175,8 @@ if(WIN32 AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio"))
|
|||
endif()
|
||||
|
||||
set(CMAKE_TOOLCHAIN_FILE ${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake CACHE FILEPATH "vcpkg toolchain" FORCE)
|
||||
endfunction()
|
||||
|
||||
vcpkg_set_toolchain()
|
||||
|
||||
include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
|
||||
|
|
Loading…
Reference in New Issue