Skip to content

Remove deprecated cmake from templates #23283

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.

Sign up for GitHub

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

Merged
Robert Schumacher (ras0219-msft) merged 4 commits into from
Mar 1, 2022
Merged

Remove deprecated cmake from templates #23283

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5bbbb8
Remove deprecated cmake from templates
Thomas1664 Feb 26, 2022
18b712c
Merge branch 'microsoft:master' into templates
Thomas1664 Feb 26, 2022
167da1f
Fix /
Thomas1664 Feb 26, 2022
3e5ef05
Comment about vcpkg_cmake_config_fixup
Thomas1664 Feb 28, 2022
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
13 changes: 6 additions & 7 deletions scripts/templates/portfile.in.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,18 @@ vcpkg_extract_source_archive_ex(
# tbb ROCKSDB_IGNORE_PACKAGE_TBB
# )

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
# OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
# OPTIONS_RELEASE -DOPTIMIZE=1
# OPTIONS_DEBUG -DDEBUGGABLE=1
)

vcpkg_install_cmake()
vcpkg_cmake_install()

# # Moves all .cmake files from /debug/share/@PORT@/ to /share/@PORT@/
# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details
# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/@PORT@)
# # See docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md for more details
# vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/@PORT@)

# # Handle 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)
11 changes: 10 additions & 1 deletion scripts/templates/vcpkg.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,16 @@
"version-string": "",
"homepage": "",
"description": "",
"dependencies": [],
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
Comment thread
Thomas1664 marked this conversation as resolved.
Outdated
],

"default-features": [],
"features": [
Expand Down