mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:52:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

update vcpkg_configure_cmake

Browse Source
This commit is contained in:
Alexander Neumann 2019-09-20 12:52:33 +02:00
parent 0c7bf66527
commit 119e9b5729
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -72,14 +72,11 @@ function(vcpkg_configure_cmake)
endif() endif()
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(_PATHSEP ";")
if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432}) set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432})
else() else()
set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITECTURE}) set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITECTURE})
endif() endif()
else()
set(_PATHSEP ":")
endif() endif()
set(NINJA_CAN_BE_USED ON) # Ninja as generator set(NINJA_CAN_BE_USED ON) # Ninja as generator
@ -154,7 +151,7 @@ function(vcpkg_configure_cmake)
if(GENERATOR STREQUAL "Ninja") if(GENERATOR STREQUAL "Ninja")
vcpkg_find_acquire_program(NINJA) vcpkg_find_acquire_program(NINJA)
get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) get_filename_component(NINJA_PATH ${NINJA} DIRECTORY)
set(ENV{PATH} "$ENV{PATH}${_PATHSEP}${NINJA_PATH}") vcpkg_add_to_path("${NINJA_PATH}")
list(APPEND _csc_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") list(APPEND _csc_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}")
endif() endif()
@ -265,7 +262,7 @@ function(vcpkg_configure_cmake)
vcpkg_find_acquire_program(NINJA) vcpkg_find_acquire_program(NINJA)
get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) get_filename_component(NINJA_PATH ${NINJA} DIRECTORY)
set(ENV{PATH} "$ENV{PATH}${_PATHSEP}${NINJA_PATH}") vcpkg_add_to_path("${NINJA_PATH}")
#parallelize the configure step #parallelize the configure step
set(_contents set(_contents