The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 19:17:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ericmitt

Browse Source
This commit is contained in:
Alexander Karatarakis 2016-11-08 15:27:59 -08:00
commit 68d4a4c4bc
83 changed files with 197 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ports/ace/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
@ -19,7 +19,7 @@ else ()
set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH})
endif()
# Add ace/config.h file
# Add ace/config.h file
# see http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#win32
file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
vcpkg_build_msbuild(
@ -27,16 +27,16 @@ vcpkg_build_msbuild(
PLATFORM ${MSBUILD_PLATFORM}
)
# ACE itself does not define an install target, so it is not clear which
# headers are public and which not. For the moment we install everything
# ACE itself does not define an install target, so it is not clear which
# headers are public and which not. For the moment we install everything
# that is in the source path and ends in .h, .inl
function(install_ace_headers_subdirectory SOURCE_PATH RELATIVE_PATH)
file(GLOB HEADER_FILES ${SOURCE_PATH}/${RELATIVE_PATH}/*.h ${SOURCE_PATH}/${RELATIVE_PATH}/*.inl)
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/${RELATIVE_PATH})
endfunction()
# We manually install header found in the ace directory because in that case
# we are supposed to install also *cpp files, see ACE_wrappers\debian\libace-dev.install file
# We manually install header found in the ace directory because in that case
# we are supposed to install also *cpp files, see ACE_wrappers\debian\libace-dev.install file
file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h ${SOURCE_PATH}/*.inl ${SOURCE_PATH}/*.cpp)
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/)
@ -65,7 +65,7 @@ function(install_ace_library SOURCE_PATH ACE_LIBRARY)
${LIB_PATH}/${ACE_LIBRARY}.pdb
DESTINATION ${CURRENT_PACKAGES_DIR}/bin
)
file(INSTALL
${LIB_PATH}/${ACE_LIBRARY}d.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib

1
ports/apr/portfile.cmake
View File

@ -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/apr-1.5.2)
vcpkg_download_distfile(ARCHIVE

1
ports/assimp/portfile.cmake
View File

@ -6,7 +6,6 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/assimp/assimp/archive/v3.3.1.zip"

4
ports/bond/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-53ea13692925bee4ba494ee9de3614f15c09d85d)

1
ports/boost/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0)

1
ports/box2d/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
# Get output directory
set(PROJECT_ARCH_BITS "x64")

1
ports/bullet3/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bullet3-98d47809b4273d97ea06c9b2137ada10af581bb9)
vcpkg_download_distfile(ARCHIVE

6
ports/chakracore/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
find_program(POWERSHELL powershell)

3
ports/cpprestsdk/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cpprestsdk-2.9.0)
@ -12,7 +11,7 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
)

8
ports/cryptopp/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
message(FATAL_ERROR "Dynamic building not supported") # See note below
message(STATUS "Warning: Dynamic building not supported. Building static.") # See note below
set(VCPKG_LIBRARY_LINKAGE static)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cryptopp-CRYPTOPP_5_6_5)
@ -37,8 +37,8 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/cryptest.exe)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/cryptest.exe)
# Remove other files not required in package
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
# Handle copyright
file(COPY ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cryptopp)

4
ports/curl/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/curl-curl-7_51_0)

1
ports/double-conversion/portfile.cmake
View File

@ -14,7 +14,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/double-conversion-d4d68e4e788bec89d55a6a3e33af674087837c82)
vcpkg_download_distfile(ARCHIVE

4
ports/dxut/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DXUT-sept2016)

1
ports/expat/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/expat-2.1.1)
vcpkg_download_distfile(ARCHIVE_FILE

1
ports/fastlz/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FastLZ-master)
vcpkg_download_distfile(ARCHIVE

4
ports/fmt/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
message(FATAL_ERROR "Dynamic building not supported yet")
message(STATUS "Warning: Dynamic building not supported yet. Building static.")
set(VCPKG_LIBRARY_LINKAGE static)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fmt-3.0.0)

4
ports/freeglut/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE

1
ports/freetype/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freetype-2.6.3)
vcpkg_download_distfile(ARCHIVE

1
ports/geos/portfile.cmake
View File

@ -6,7 +6,6 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
#downloading 3.5 from their SVN repo and not the release tarball
#because the 3.5 release did not build on windows, and fixes were backported

1
ports/gettext/portfile.cmake
View File

@ -8,7 +8,6 @@
#Based on https://github.com/winlibs/gettext
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gettext-0.19)
vcpkg_download_distfile(ARCHIVE

5
ports/gflags/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
find_program(GIT git)
@ -64,8 +63,8 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/gflags/gflags-export-release.cmake "${G
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
file(READ ${CURRENT_PACKAGES_DIR}/share/gflags/gflags-export.cmake GFLAGS_CONFIG_MODULE)
string(REPLACE "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
"get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
string(REPLACE "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
"get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
GFLAGS_CONFIG_MODULE "${GFLAGS_CONFIG_MODULE}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/gflags/gflags-export.cmake ${GFLAGS_CONFIG_MODULE})

1
ports/glbinding/portfile.cmake
View File

@ -6,7 +6,6 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE

4
ports/glew/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glew-2.0.0)

1
ports/glfw3/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glfw-3.2.1)
vcpkg_download_distfile(ARCHIVE

4
ports/glog/portfile.cmake
View File

@ -6,9 +6,9 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet. Portfile needs modification and also blocked by flags")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glog-0472b91c5defdf90cff7292e3bf7bd86770a9a0a)

4
ports/grpc/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
find_program(GIT git)

4
ports/gtest/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)

4
ports/harfbuzz/portfile.cmake
View File

@ -6,9 +6,9 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet. Portfile not modified for static and blocked on freetype.")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/harfbuzz-1.3.2)

1
ports/jxrlib/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
vcpkg_download_distfile(ARCHIVE

4
ports/libbson/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.4.2)

1
ports/libccd/portfile.cmake
View File

@ -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/libccd-16b9379fb6e8610566fe5e1396166daf7106f165)
vcpkg_download_distfile(ARCHIVE

1
ports/libiconv/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libiconv-1.14)
vcpkg_download_distfile(ARCHIVE

1
ports/libjpeg-turbo/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libjpeg-turbo-1.4.90)

26
ports/libmariadb/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mariadb-connector-c-2.3.1)
@ -26,27 +26,27 @@ vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# fix libmariadb lib & dll directory.
file(MAKE_DIRECTORY
file(MAKE_DIRECTORY
${CURRENT_PACKAGES_DIR}/bin
${CURRENT_PACKAGES_DIR}/debug/bin)
file(RENAME
${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.dll
file(RENAME
${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.dll
${CURRENT_PACKAGES_DIR}/bin/libmariadb.dll)
file(RENAME
${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.dll
file(RENAME
${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.dll
${CURRENT_PACKAGES_DIR}/debug/bin/libmariadb.dll)
file(RENAME
${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.lib
file(RENAME
${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.lib
${CURRENT_PACKAGES_DIR}/lib/libmariadb.lib)
file(RENAME
${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.lib
file(RENAME
${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.lib
${CURRENT_PACKAGES_DIR}/debug/lib/libmariadb.lib)
file(REMOVE
file(REMOVE
${CURRENT_PACKAGES_DIR}/lib/mariadb/mariadbclient.lib
${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/mariadbclient.lib)
# remove plugin folder
file(REMOVE_RECURSE
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/lib/plugin
${CURRENT_PACKAGES_DIR}/debug/lib/plugin
${CURRENT_PACKAGES_DIR}/lib/mariadb

10
ports/libmysql/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mysql-server-mysql-5.7.16)
@ -18,7 +18,7 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
)
@ -29,11 +29,11 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
# delete debug headers
file(REMOVE_RECURSE
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include)
# delete useless vcruntime/scripts/bin/msg file
file(REMOVE_RECURSE
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/share
${CURRENT_PACKAGES_DIR}/debug/share
${CURRENT_PACKAGES_DIR}/bin

1
ports/libodb-sqlite/portfile.cmake
View File

@ -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/libodb-sqlite-2.4.0)
vcpkg_download_distfile(ARCHIVE

1
ports/libodb/portfile.cmake
View File

@ -6,7 +6,6 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
include(CMakePackageConfigHelpers)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libodb-2.4.0)

1
ports/libogg/portfile.cmake
View File

@ -6,7 +6,6 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
find_program(GIT git)

1
ports/libpng/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24)

1
ports/libraw/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/LibRaw-0.17.2)
vcpkg_download_distfile(ARCHIVE

1
ports/libtheora/portfile.cmake
View File

@ -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/libtheora-1.1.1)
vcpkg_download_distfile(ARCHIVE

4
ports/libuv/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-src/libuv-1.9.1)

4
ports/libvorbis/portfile.cmake
View File

@ -6,9 +6,9 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
find_program(GIT git)

1
ports/libwebp/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libwebp-0.5.1)
vcpkg_download_distfile(ARCHIVE

4
ports/libwebsockets/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libwebsockets-2.0.0)

1
ports/libxml2/portfile.cmake
View File

@ -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/libxml2-2.9.4)
vcpkg_download_distfile(ARCHIVE

1
ports/log4cplus/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/log4cplus-REL_1_1_3-RC7)
vcpkg_download_distfile(ARCHIVE

1
ports/lua/portfile.cmake
View File

@ -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/lua-5.3.3)
vcpkg_download_distfile(ARCHIVE

4
ports/mongo-c-driver/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet. Portfile not modified and blocked by libbson.")
message(STATUS "Warning: Static building not supported yet. Building dynamic.") #Blocked by libbson
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-c-driver-1.4.2)

6
ports/mongo-cxx-driver/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet. Portfile not modified and blocked by libbson.")
message(STATUS "Warning: Static building not supported yet. Building dynamic.") #Blocked by libbson
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.0.2)
@ -24,7 +24,7 @@ vcpkg_configure_cmake(
-DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR}
)
vcpkg_install_cmake()
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)

4
ports/mpg123/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpg123-1.23.3)

4
ports/mpir/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2)

8
ports/nanodbc/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/nanodbc-2.12.4)
@ -14,7 +14,7 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
${CMAKE_CURRENT_LIST_DIR}/0002_msvc14_codecvt.patch
${CMAKE_CURRENT_LIST_DIR}/0003_export_def.patch
@ -29,7 +29,7 @@ vcpkg_configure_cmake(
-DNANODBC_USE_UNICODE=ON
)
vcpkg_install_cmake()
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

4
ports/openal-soft/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openal-soft-1.17.2)

4
ports/opencv/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet. Portfile not modified and blocked by libjpeg-turbo.")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/opencv-92387b1ef8fad15196dd5f7fb4931444a68bc93a)

1
ports/openjpeg/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openjpeg-2.1.2)
vcpkg_download_distfile(ARCHIVE

2
ports/openssl/portfile.cmake
View File

@ -1,5 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
include(${CMAKE_CURRENT_LIST_DIR}/portfile-uwp.cmake)
return()

1
ports/pcre/portfile.cmake
View File

@ -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/pcre-8.38)
vcpkg_download_distfile(ARCHIVE

1
ports/pdcurses/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
message(FATAL_ERROR "64-bit builds are not supported for PDCurses.")

4
ports/physfs/portfile.cmake
View File

@ -6,9 +6,9 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/physfs-2.0.3)

1
ports/ragel/portfile.cmake
View File

@ -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/ragel-6.9)
vcpkg_download_distfile(ARCHIVE

4
ports/sdl2/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2-2.0.4)

4
ports/sery/portfile.cmake
View File

@ -1,6 +1,6 @@
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
message(FATAL_ERROR "Dynamic building not supported yet")
message(STATUS "Warning: Dynamic building not supported yet. Building static.")
set(VCPKG_LIBRARY_LINKAGE static)
endif()
include(vcpkg_common_functions)
SET(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/Sery-1.0")

1
ports/sqlite3/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-3150000)
vcpkg_download_distfile(ARCHIVE

4
ports/tbb/portfile.cmake
View File

@ -6,9 +6,9 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)

1
ports/tiff/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tiff-4.0.6)
vcpkg_download_distfile(ARCHIVE

1
ports/tinyxml2/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tinyxml2-3.0.0)
vcpkg_download_distfile(ARCHIVE

1
ports/wt/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/wt-3.3.6)

1
ports/zeromq/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libzmq-1a02b1b3f2fde6288579cbb0ff9a0b1f195e1812)
vcpkg_download_distfile(ARCHIVE

1
ports/zlib/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/zlib-1.2.8)
vcpkg_download_distfile(ARCHIVE_FILE

1
ports/zziplib/portfile.cmake
View File

@ -1,4 +1,3 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/zziplib-0.13.62)
vcpkg_download_distfile(ARCHIVE

5
scripts/ports.cmake
View File

@ -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)

1
scripts/templates/portfile.in.cmake
View File

@ -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

28
toolsrc/include/BuildInfo.h Normal file
View File

@ -0,0 +1,28 @@
#pragma once
#include <unordered_map>
#include "Paragraphs.h"
namespace fs = std::tr2::sys;
namespace vcpkg
{
enum class LinkageType
{
DYNAMIC,
STATIC,
UNKNOWN
};
LinkageType linkage_type_value_of(const std::string& as_string);
struct BuildInfo
{
static BuildInfo create(const std::unordered_map<std::string, std::string>& pgh);
std::string crt_linkage;
std::string library_linkage;
};
BuildInfo read_build_info(const fs::path& filepath);
}

8
toolsrc/include/triplet.h
View File

@ -8,20 +8,12 @@ namespace vcpkg
{
static triplet from_canonical_name(const std::string& triplet_as_string);
enum class BuildType
{
DYNAMIC,
STATIC
};
static const triplet X86_WINDOWS;
static const triplet X64_WINDOWS;
static const triplet X86_UWP;
static const triplet X64_UWP;
static const triplet ARM_UWP;
BuildType build_type() const;
const std::string& canonical_name() const;
std::string architecture() const;

2
toolsrc/include/vcpkg_paths.h
View File

@ -14,7 +14,9 @@ namespace vcpkg
fs::path package_dir(const package_spec& spec) const;
fs::path port_dir(const package_spec& spec) const;
fs::path build_info_file_path(const package_spec& spec) const;
fs::path listfile_path(const BinaryParagraph& pgh) const;
bool is_valid_triplet(const triplet& t) const;
fs::path root;

46
toolsrc/src/BuildInfo.cpp Normal file
View File

@ -0,0 +1,46 @@
#include "BuildInfo.h"
#include "vcpkg_Checks.h"
#include "vcpkglib_helpers.h"
namespace vcpkg
{
//
namespace BuildInfoRequiredField
{
static const std::string CRT_LINKAGE = "CRTLinkage";
static const std::string LIBRARY_LINKAGE = "LibraryLinkage";
}
BuildInfo BuildInfo::create(const std::unordered_map<std::string, std::string>& pgh)
{
BuildInfo build_info;
build_info.crt_linkage = details::required_field(pgh, BuildInfoRequiredField::CRT_LINKAGE);
build_info.library_linkage = details::required_field(pgh, BuildInfoRequiredField::LIBRARY_LINKAGE);
return build_info;
}
LinkageType linkage_type_value_of(const std::string& as_string)
{
if (as_string == "dynamic")
{
return LinkageType::DYNAMIC;
}
if (as_string == "static")
{
return LinkageType::STATIC;
}
return LinkageType::UNKNOWN;
}
BuildInfo read_build_info(const fs::path& filepath)
{
const std::vector<std::unordered_map<std::string, std::string>> pghs = Paragraphs::get_paragraphs(filepath);
Checks::check_throw(pghs.size() == 1, "Invalid BUILD_INFO file for package");
return BuildInfo::create(pghs[0]);
}
}

18
toolsrc/src/post_build_lint.cpp
View File

@ -5,6 +5,7 @@
#include <functional>
#include "vcpkg_System.h"
#include "coff_file_reader.h"
#include "BuildInfo.h"
namespace fs = std::tr2::sys;
@ -495,6 +496,9 @@ namespace vcpkg
void perform_all_checks(const package_spec& spec, const vcpkg_paths& paths)
{
System::println("-- Performing post-build validation");
BuildInfo build_info = read_build_info(paths.build_info_file_path(spec));
size_t error_count = 0;
error_count += check_for_files_in_include_directory(spec, paths);
error_count += check_for_files_in_debug_include_directory(spec, paths);
@ -506,10 +510,9 @@ namespace vcpkg
error_count += check_for_copyright_file(spec, paths);
error_count += check_for_exes(spec, paths);
triplet::BuildType build_type = spec.target_triplet().build_type();
switch (build_type)
switch (linkage_type_value_of(build_info.library_linkage))
{
case triplet::BuildType::DYNAMIC:
case LinkageType::DYNAMIC:
{
const std::vector<fs::path> debug_dlls = recursive_find_files_with_extension_in_dir(paths.packages / spec.dir() / "debug" / "bin", ".dll");
const std::vector<fs::path> release_dlls = recursive_find_files_with_extension_in_dir(paths.packages / spec.dir() / "bin", ".dll");
@ -525,7 +528,7 @@ namespace vcpkg
error_count += check_dll_architecture(spec.target_triplet().architecture(), dlls);
break;
}
case triplet::BuildType::STATIC:
case LinkageType::STATIC:
{
std::vector<fs::path> dlls;
recursive_find_files_with_extension_in_dir(paths.packages / spec.dir(), ".dll", &dlls);
@ -534,7 +537,12 @@ namespace vcpkg
error_count += check_bin_folders_are_not_present_in_static_build(spec, paths);
break;
}
case LinkageType::UNKNOWN:
{
error_count += 1;
System::println(System::color::warning, "Unknown library_linkage architecture: [ %s ]", build_info.library_linkage);
break;
}
default:
Checks::unreachable();
}

10
toolsrc/src/triplet.cpp
View File

@ -64,14 +64,4 @@ namespace vcpkg
auto it = std::find(this->m_canonical_name.cbegin(), this->m_canonical_name.cend(), '-');
return std::string(it + 1, this->m_canonical_name.cend());
}
triplet::BuildType triplet::build_type() const
{
if (this->m_canonical_name.find("static") != std::string::npos)
{
return BuildType::STATIC;
}
return BuildType::DYNAMIC;
}
}

2
toolsrc/src/vcpkg.cpp
View File

@ -158,7 +158,7 @@ static void install_and_write_listfile(const vcpkg_paths& paths, const BinaryPar
for (auto it = fs::recursive_directory_iterator(package_prefix_path); it != fs::recursive_directory_iterator(); ++it)
{
const auto& filename = it->path().filename();
if (fs::is_regular_file(it->status()) && (filename == "CONTROL" || filename == "control"))
if (fs::is_regular_file(it->status()) && (_stricmp(filename.generic_string().c_str(), "CONTROL") == 0 || _stricmp(filename.generic_string().c_str(), "BUILD_INFO") == 0))
{
// Do not copy the control file
continue;

5
toolsrc/src/vcpkg_paths.cpp
View File

@ -55,6 +55,11 @@ namespace vcpkg
return this->ports / spec.name();
}
fs::path vcpkg_paths::build_info_file_path(const package_spec& spec) const
{
return this->package_dir(spec) / "BUILD_INFO";
}
fs::path vcpkg_paths::listfile_path(const BinaryParagraph& pgh) const
{
return this->vcpkg_dir_info / (pgh.fullstem() + ".list");

2
toolsrc/vcpkglib/vcpkglib.vcxproj
View File

@ -123,6 +123,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\include\BinaryParagraph.h" />
<ClInclude Include="..\include\BuildInfo.h" />
<ClInclude Include="..\include\package_spec.h" />
<ClInclude Include="..\include\package_spec_parse_result.h" />
<ClInclude Include="..\include\Paragraphs.h" />
@ -137,6 +138,7 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\BinaryParagraph.cpp" />
<ClCompile Include="..\src\BuildInfo.cpp" />
<ClCompile Include="..\src\vcpkg.cpp" />
<ClCompile Include="..\src\package_spec.cpp" />
<ClCompile Include="..\src\package_spec_parse_result.cpp" />

6
toolsrc/vcpkglib/vcpkglib.vcxproj.filters
View File

@ -51,6 +51,9 @@
<ClCompile Include="..\src\vcpkg_info.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\BuildInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\vcpkg.h">
@ -89,5 +92,8 @@
<ClInclude Include="..\include\vcpkg_info.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\BuildInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>