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

[lua] Export cmake targets, rewrite CMakeLists and delete usage #15921

Merged
merged 12 commits into from
Aug 12, 2021

Conversation

JackBoosY
Copy link
Contributor

Since FindLua.cmake sets the default search path, and the header file is included in lua-version by default, it is impossible to find the lua generated by vcpkg correctly, export the targets and modify the cmake wrapper to adapt to the search method of the old version.

Fixes #15497.

@JackBoosY JackBoosY added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Jan 28, 2021
@JackBoosY
Copy link
Contributor Author

JackBoosY commented Jan 28, 2021

@Williamxin Can you please test this PR?

Thanks.

@yongxin-ms
Copy link

@Williamxin Can you please test this PR?

Thanks.

thank you!
i am working on it, but there is another issue in vcpkg, everything works perfect on windows, but bootstrap.sh failed on my mac

@yongxin-ms
Copy link

@Williamxin Can you please test this PR?

Thanks.

now cmake can finish on my centos, the problem has been solved, thank you

@JackBoosY JackBoosY requested a review from NancyLi1013 February 1, 2021 02:30
@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Feb 1, 2021
ports/lua/vcpkg-cmake-wrapper.cmake.in Outdated Show resolved Hide resolved
ports/lua/usage Show resolved Hide resolved
@JackBoosY JackBoosY removed the info:reviewed Pull Request changes follow basic guidelines label Feb 3, 2021
@JackBoosY
Copy link
Contributor Author

@ras0219-msft Do you have any other questions?

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Feb 5, 2021
@pkeir
Copy link

pkeir commented Mar 3, 2021

I tried this PR on Ubuntu 20.10 and still face a problem: see here.

@JackBoosY JackBoosY removed the info:reviewed Pull Request changes follow basic guidelines label Mar 3, 2021
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout fa1bbe097b26678e3fd992173b62279c071c422b -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index ae0396a..6186ece 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3858,7 +3858,7 @@
     },
     "lua": {
       "baseline": "5.4.3",
-      "port-version": 1
+      "port-version": 2
     },
     "luabridge": {
       "baseline": "2.6",
diff --git a/versions/l-/lua.json b/versions/l-/lua.json
index fd0f4da..399d6e8 100644
--- a/versions/l-/lua.json
+++ b/versions/l-/lua.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d4f0d15b931f54c58381e6896517410ef7778cd8",
+      "version-string": "5.4.3",
+      "port-version": 2
+    },
     {
       "git-tree": "0e8966273a1a18cf591cf78046d345c74941a37d",
       "version-string": "5.4.3",

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout fa1bbe097b26678e3fd992173b62279c071c422b -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index ae0396a..6186ece 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3858,7 +3858,7 @@
     },
     "lua": {
       "baseline": "5.4.3",
-      "port-version": 1
+      "port-version": 2
     },
     "luabridge": {
       "baseline": "2.6",
diff --git a/versions/l-/lua.json b/versions/l-/lua.json
index fd0f4da..7503666 100644
--- a/versions/l-/lua.json
+++ b/versions/l-/lua.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "10e0f0c1ebdf0c22e904c2da968a0a5044917a1f",
+      "version-string": "5.4.3",
+      "port-version": 2
+    },
     {
       "git-tree": "0e8966273a1a18cf591cf78046d345c74941a37d",
       "version-string": "5.4.3",

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout fa1bbe097b26678e3fd992173b62279c071c422b -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index ae0396a..6186ece 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3858,7 +3858,7 @@
     },
     "lua": {
       "baseline": "5.4.3",
-      "port-version": 1
+      "port-version": 2
     },
     "luabridge": {
       "baseline": "2.6",
diff --git a/versions/l-/lua.json b/versions/l-/lua.json
index fd0f4da..229dc27 100644
--- a/versions/l-/lua.json
+++ b/versions/l-/lua.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3e9ae23186ccbf4e89af8d32a4f8a23d0194dea5",
+      "version-string": "5.4.3",
+      "port-version": 2
+    },
     {
       "git-tree": "0e8966273a1a18cf591cf78046d345c74941a37d",
       "version-string": "5.4.3",

@JackBoosY
Copy link
Contributor Author

The tensorflow-cc regression will be resolved by #19165.

@JackBoosY JackBoosY added depends:different-pr This PR or Issue depends on a PR which has been filed and removed depends:different-pr This PR or Issue depends on a PR which has been filed labels Jul 30, 2021
@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Aug 2, 2021
@BillyONeal BillyONeal merged commit 1dfb5d9 into microsoft:master Aug 12, 2021
@BillyONeal
Copy link
Member

Thanks for your contribution!

@JackBoosY JackBoosY deleted the dev/jack/15497 branch August 12, 2021 02:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[lua] cmake can not return on linux, while compiling, the cpu usage is 100%, and the task will never end
6 participants