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

Delete use of vcpkg_test_cmake and vcpkg_common_functions. #13065

Merged
merged 10 commits into from
Oct 28, 2020

Conversation

BillyONeal
Copy link
Member

CONTROL files are intentionally not updated because this change should not affect callers of vcpkg upgrade.

  • vcpkg_test_cmake is a no-op that was usually commented out and has been slowly getting deleted.
  • vcpkg_common_functions was a no-op because we already provide those ambiently in portfile.cmake.

@@ -1,51 +0,0 @@
include(execute_process)
Copy link
Contributor

@ras0219 ras0219 Aug 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should leave stubs behind for backwards compatibility with previous ports -- when we enable versioning, users will be able to access them (and we recommend they do so today anyway via git checkout <sha> -- blah).

## ### MODULE
## Indicates that the library expects to be found via built-in CMake targets.
##
function(vcpkg_test_cmake)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should leave a stub behind for compatibility.

@BillyONeal BillyONeal changed the title Delete vcpkg_test_cmake and vcpkg_common_functions. Delete use of vcpkg_test_cmake and vcpkg_common_functions. Aug 21, 2020
@ras0219
Copy link
Contributor

ras0219 commented Aug 21, 2020

LGTM once DO NOT MERGE has been unmerged :)

@JackBoosY
Copy link
Contributor

In fact, I am thinking of rewriting vcpkg_test_cmake and adding a common method for test generated libraries.

@cenit
Copy link
Contributor

cenit commented Aug 25, 2020

@JackBoosY maybe your test can be applied automatically to every port without any command from portfile? That would be awesome

@BillyONeal
Copy link
Member Author

Reviewing the second commit by itself is suggested since all the tool changes are in there.

# Conflicts:
#	ports/liblinear/portfile.cmake
#	ports/librsync/portfile.cmake
# Conflicts:
#	ports/capnproto/portfile.cmake
#	ports/concurrentqueue/portfile.cmake
#	ports/decimal-for-cpp/portfile.cmake
#	ports/fuzzylite/portfile.cmake
#	ports/modp-base64/portfile.cmake
#	ports/readerwriterqueue/portfile.cmake
#	ports/refprop-headers/portfile.cmake
# Conflicts:
#	ports/7zip/portfile.cmake
#	ports/muparser/portfile.cmake
#	ports/nmslib/portfile.cmake
ras0219 pushed a commit to ras0219/vcpkg that referenced this pull request Oct 9, 2020
# Conflicts:
#	ports/aixlog/portfile.cmake
#	ports/antlr4/portfile.cmake
#	ports/chakracore/portfile.cmake
#	ports/cppwinrt/portfile.cmake
#	ports/crc32c/portfile.cmake
#	ports/fastcdr/portfile.cmake
#	ports/freetds/portfile.cmake
#	ports/jack2/portfile.cmake
#	ports/jbig2dec/portfile.cmake
#	ports/libgeotiff/portfile.cmake
#	ports/libnoise/portfile.cmake
#	ports/libp7-baical/portfile.cmake
#	ports/libp7client/portfile.cmake
#	ports/libsamplerate/portfile.cmake
#	ports/nvtt/portfile.cmake
#	ports/qca/portfile.cmake
#	ports/snowhouse/portfile.cmake
#	ports/taocpp-json/portfile.cmake
# Conflicts:
#	ports/wangle/portfile.cmake
@BillyONeal BillyONeal merged commit 09a647a into microsoft:master Oct 28, 2020
@BillyONeal
Copy link
Member Author

Merged because all failures were in the baseline.

@BillyONeal BillyONeal deleted the cleanup branch October 28, 2020 21:18
strega-nil pushed a commit to strega-nil/vcpkg that referenced this pull request May 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants