Add to vcpkg.cmake

This commit is contained in:
Curtis.Bezault 2019-07-16 15:51:50 -07:00
parent 44dcc3d4f3
commit 64198a8109
3 changed files with 4 additions and 2 deletions

View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE}) include(${CMAKE_TRIPLET_FILE})
if (DEFINED CMAKE_PORTFILE_SETTINGS) if (DEFINED CMAKE_PORT_SETTINGS)
include(${CMAKE_PORTFILE_SETTINGS} OPTIONAL) include(${CMAKE_PORT_SETTINGS} OPTIONAL)
endif() endif()
# GUID used as a flag - "cut here line" # GUID used as a flag - "cut here line"

View File

@ -67,6 +67,7 @@ if(CMD MATCHES "^BUILD$")
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR}) file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR})
include(${CMAKE_TRIPLET_FILE}) include(${CMAKE_TRIPLET_FILE})
include(${CMAKE_PORT_SETTINGS} OPTIONAL)
set(TRIPLET_SYSTEM_ARCH ${VCPKG_TARGET_ARCHITECTURE}) set(TRIPLET_SYSTEM_ARCH ${VCPKG_TARGET_ARCHITECTURE})
include(${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg_common_definitions.cmake) include(${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg_common_definitions.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg_common_functions.cmake) include(${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg_common_functions.cmake)

View File

@ -401,6 +401,7 @@ namespace vcpkg::Build
{"CURRENT_PORT_DIR", config.port_dir}, {"CURRENT_PORT_DIR", config.port_dir},
{"TARGET_TRIPLET", triplet.canonical_name()}, {"TARGET_TRIPLET", triplet.canonical_name()},
{"TARGET_TRIPLET_FILE", paths.get_triplet_file_path(triplet).u8string()}, {"TARGET_TRIPLET_FILE", paths.get_triplet_file_path(triplet).u8string()},
{"CMAKE_PORT_SETTINGS", config.port_dir / "port_settings.cmake"},
{"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()}, {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()},
{"VCPKG_USE_HEAD_VERSION", Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"}, {"VCPKG_USE_HEAD_VERSION", Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"},
{"DOWNLOADS", paths.downloads}, {"DOWNLOADS", paths.downloads},