diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-08 15:27:59 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-08 15:27:59 -0800 |
| commit | 68d4a4c4bc0309dcac61752a871f84633a211777 (patch) | |
| tree | be450dbab493740a63971b3474963088a033c12a /scripts | |
| parent | e9ddf167b19fb63dd4defaddcfe4cae2f6c223ca (diff) | |
| parent | dbab03a1a82913ae96bfa3c1613ade20b5ac438d (diff) | |
| download | vcpkg-68d4a4c4bc0309dcac61752a871f84633a211777.tar.gz vcpkg-68d4a4c4bc0309dcac61752a871f84633a211777.zip | |
Merge branch 'master' into ericmitt
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ports.cmake | 5 | ||||
| -rw-r--r-- | scripts/templates/portfile.in.cmake | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 44cb386be..762997491 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -70,7 +70,12 @@ if(CMD MATCHES "^BUILD$") endif() file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR}) + include(${CMAKE_TRIPLET_FILE}) include(${CURRENT_PORT_DIR}/portfile.cmake) + + set(BUILD_INFO_FILE_PATH ${CURRENT_PACKAGES_DIR}/BUILD_INFO) + file(WRITE ${BUILD_INFO_FILE_PATH} "CRTLinkage: ${VCPKG_CRT_LINKAGE}\n") + file(APPEND ${BUILD_INFO_FILE_PATH} "LibraryLinkage: ${VCPKG_LIBRARY_LINKAGE}") elseif(CMD MATCHES "^CREATE$") file(TO_NATIVE_PATH ${VCPKG_ROOT_DIR} NATIVE_VCPKG_ROOT_DIR) file(TO_NATIVE_PATH ${DOWNLOADS} NATIVE_DOWNLOADS) diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 804d8d216..c848b6445 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/@ROOT_NAME@) vcpkg_download_distfile(ARCHIVE |