Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[many ports]switch to vcpkg-cmake / vcpkg-cmake-config part 2 #29882

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ports/eathread/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ vcpkg_from_github(
fix_cmake_install.patch
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/EAThreadConfig.cmake.in DESTINATION ${SOURCE_PATH})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/EAThreadConfig.cmake.in" DESTINATION "${SOURCE_PATH}")

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DEATHREAD_BUILD_TESTS=OFF
)
Expand All @@ -22,10 +22,10 @@ vcpkg_cmake_install()

vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EAThread)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

vcpkg_copy_pdbs()

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/3RDPARTYLICENSES.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/eathread)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/3RDPARTYLICENSES.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/eathread")
2 changes: 1 addition & 1 deletion ports/eathread/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eathread",
"version-string": "1.32.09",
"port-version": 4,
"port-version": 5,
"description": "Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.",
"homepage": "https://github.com/electronicarts/EAThread",
"supports": "!uwp & x64",
Expand Down
8 changes: 4 additions & 4 deletions ports/ecos/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ vcpkg_from_github(
HEAD_REF develop
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
)

vcpkg_cmake_install()

file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecos RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_cmake_config_fixup(CONFIG_PATH "share/ecos")
2 changes: 1 addition & 1 deletion ports/ecos/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ecos",
"version": "2.0.8",
"port-version": 2,
"port-version": 3,
"description": "A lightweight conic solver for second-order cone programming.",
"dependencies": [
{
Expand Down
7 changes: 3 additions & 4 deletions ports/entityx/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ vcpkg_from_github(
)

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DENTITYX_BUILD_TESTING=false
Expand All @@ -18,8 +18,7 @@ vcpkg_cmake_configure(

vcpkg_cmake_install()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

# Handle copyright
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/entityx)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/entityx/COPYING ${CURRENT_PACKAGES_DIR}/share/entityx/copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/entityx" RENAME copyright)
2 changes: 1 addition & 1 deletion ports/entityx/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "entityx",
"version": "1.3.0",
"port-version": 4,
"port-version": 5,
"description": "EntityX - A fast, type-safe C++ Entity-Component system.",
"homepage": "https://github.com/alecthomas/entityx",
"dependencies": [
Expand Down
10 changes: 5 additions & 5 deletions ports/fastfeat/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ vcpkg_from_github(


file(COPY
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
${CMAKE_CURRENT_LIST_DIR}/fastfeat.def
DESTINATION ${SOURCE_PATH}
"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
"${CMAKE_CURRENT_LIST_DIR}/fastfeat.def"
DESTINATION "${SOURCE_PATH}"
)

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS_DEBUG
-DDISABLE_INSTALL_HEADERS=ON
)
Expand All @@ -23,4 +23,4 @@ vcpkg_cmake_install()
vcpkg_copy_pdbs()

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fastfeat RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/fastfeat" RENAME copyright)
2 changes: 1 addition & 1 deletion ports/fastfeat/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fastfeat",
"version-string": "391d5e9",
"port-version": 3,
"port-version": 4,
"description": "FAST feature detectors in C",
"dependencies": [
{
Expand Down
8 changes: 4 additions & 4 deletions ports/fastlz/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ vcpkg_from_github(
HEAD_REF master
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
)

vcpkg_cmake_install()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
2 changes: 1 addition & 1 deletion ports/fastlz/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fastlz",
"version-date": "2021-05-10",
"port-version": 1,
"port-version": 2,
"description": "A lightning-fast lossless compression library",
"homepage": "https://github.com/ariya/FastLZ",
"dependencies": [
Expand Down
8 changes: 4 additions & 4 deletions ports/fdlibm/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ vcpkg_from_git(
REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/libm5.def DESTINATION ${SOURCE_PATH})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
file(COPY "${CMAKE_CURRENT_LIST_DIR}/libm5.def" DESTINATION "${SOURCE_PATH}")

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS_DEBUG
-DDISABLE_INSTALL_HEADERS=ON
)
Expand All @@ -17,5 +17,5 @@ vcpkg_cmake_install()
vcpkg_copy_pdbs()

# Handle copyright
configure_file(${SOURCE_PATH}/NOTICE ${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright COPYONLY)
configure_file("${SOURCE_PATH}/NOTICE" "${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright" COPYONLY)

2 changes: 1 addition & 1 deletion ports/fdlibm/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fdlibm",
"version": "5.3",
"port-version": 6,
"port-version": 7,
"description": "FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic",
"dependencies": [
{
Expand Down
8 changes: 4 additions & 4 deletions ports/flashlight-cpu/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ vcpkg_check_features(

# Build and install
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FL_DEFAULT_VCPKG_CMAKE_FLAGS}
${FEATURE_OPTIONS}
OPTIONS_DEBUG
-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight
"-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight"
OPTIONS_RELEASE
-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight
"-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight"
)
vcpkg_cmake_install()

Expand Down Expand Up @@ -84,4 +84,4 @@ if (NUM_TOOLS GREATER 0)
endif()

# Copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
2 changes: 1 addition & 1 deletion ports/flashlight-cpu/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "flashlight-cpu",
"version": "0.3",
"port-version": 4,
"port-version": 5,
"description": "A C++ standalone library for machine learning. CPU backend.",
"homepage": "https://github.com/facebookresearch/flashlight",
"license": "MIT",
Expand Down
8 changes: 4 additions & 4 deletions ports/flashlight-cuda/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ vcpkg_check_features(

# Build and install
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FL_DEFAULT_VCPKG_CMAKE_FLAGS}
${FEATURE_OPTIONS}
OPTIONS_DEBUG
-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight
"-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight"
OPTIONS_RELEASE
-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight
"-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight"
)
vcpkg_cmake_install()

Expand Down Expand Up @@ -83,4 +83,4 @@ if (NUM_TOOLS GREATER 0)
endif()

# Copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
2 changes: 1 addition & 1 deletion ports/flashlight-cuda/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "flashlight-cuda",
"version": "0.3",
"port-version": 5,
"port-version": 6,
"description": "A C++ standalone library for machine learning. CUDA backend.",
"homepage": "https://github.com/facebookresearch/flashlight",
"license": "MIT",
Expand Down
6 changes: 3 additions & 3 deletions ports/fmem/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ vcpkg_from_github(
)

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
)

vcpkg_cmake_install()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

vcpkg_copy_pdbs()

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmem RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/fmem" RENAME copyright)
2 changes: 1 addition & 1 deletion ports/fmem/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fmem",
"version-string": "c-libs-2ccee3d2fb",
"port-version": 2,
"port-version": 3,
"description": "A cross-platform library for opening memory-backed libc streams.",
"dependencies": [
{
Expand Down
Loading