add vcpkg-qmake for qt6 #20963

Neumann-A · 2021-10-24T12:58:35Z

QMake for Qt6 (~~untested since no dependent port so far.~~)

ports/vcpkg-qmake/vcpkg_qmake_configure.cmake

github-actions

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 2169ab765b49cfc5cd7eddfc8ff3e579326776f8 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 08c5a89..3d3816e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6972,6 +6972,10 @@
       "baseline": "2021-04-02",
       "port-version": 1
     },
+    "vcpkg-qmake": {
+      "baseline": "2021-10-23",
+      "port-version": 0
+    },
     "vcpkg-tool-nodejs": {
       "baseline": "14.17.4",
       "port-version": 0

Neumann-A · 2021-10-24T17:56:43Z

@MehdiChinoune
can you attach a ready to test vcpkg.json and portfile.cmake so i can test the code here better?

github-actions

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 2169ab765b49cfc5cd7eddfc8ff3e579326776f8 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 08c5a89..3d3816e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6972,6 +6972,10 @@
       "baseline": "2021-04-02",
       "port-version": 1
     },
+    "vcpkg-qmake": {
+      "baseline": "2021-10-23",
+      "port-version": 0
+    },
     "vcpkg-tool-nodejs": {
       "baseline": "14.17.4",
       "port-version": 0

MehdiChinoune · 2021-10-24T18:03:10Z

qwt:
portfile.cmake:

vcpkg_from_sourceforge(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO qwt/qwt
    REF 6.2.0
    FILENAME "qwt-6.2.0.zip"
    SHA512 a3946c6e23481b5a2193819a1c1298db5a069d514ca60de54accb3a249403f5acd778172ae6fae24fae252767b1e58deba524de6225462f1bafd7c947996aae9
)

vcpkg_qmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
)

if (VCPKG_TARGET_IS_WINDOWS)
    vcpkg_install_qmake(
        RELEASE_TARGETS sub-src-release_ordered
        DEBUG_TARGETS sub-src-debug_ordered
    )
else ()
    vcpkg_install_qmake(
        RELEASE_TARGETS sub-src-all-ordered
        DEBUG_TARGETS sub-src-all-ordered
    )
endif()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

#Install the header files
file(GLOB HEADER_FILES "${SOURCE_PATH}/src/*.h")
file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")

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

vcpkg.json:

{
  "name": "qwt",
  "version-semver": "6.2.0",
  "port-version": 1,
  "description": "qt widgets library for technical applications",
  "homepage": "https://sourceforge.net/projects/qwt",
  "dependencies": [
    {
      "name": "vcpkg-qmake",
      "host": true,
      "default-features": false
    },
    {
      "name": "qtbase",
      "default-features": false
    },
    "qtsvg",
    "qttools"
  ]
}

ports/vcpkg-qmake/vcpkg_qmake_configure.cmake

JackBoosY · 2021-10-25T02:29:10Z

What's the different between vcpkg-qmake and vcpkg_*_qmake?
I think we will turn the latter into a port in the near future.

ports/vcpkg-qmake/vcpkg_qmake_configure.cmake

github-actions

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

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/qwt/vcpkg.json b/ports/qwt/vcpkg.json
index 96dca1b..862195e 100644
--- a/ports/qwt/vcpkg.json
+++ b/ports/qwt/vcpkg.json
@@ -5,16 +5,16 @@
   "description": "qt widgets library for technical applications",
   "homepage": "https://sourceforge.net/projects/qwt",
   "dependencies": [
-    {
-      "name": "vcpkg-qmake",
-      "host": true,
-      "default-features": false
-    },
     {
       "name": "qtbase",
       "default-features": false
     },
     "qtsvg",
-    "qttools"
+    "qttools",
+    {
+      "name": "vcpkg-qmake",
+      "host": true,
+      "default-features": false
+    }
   ]
-}
\ No newline at end of file
+}

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 2169ab765b49cfc5cd7eddfc8ff3e579326776f8 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 08c5a89..d426982 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5762,7 +5762,7 @@
     },
     "qwt": {
       "baseline": "6.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "qwtw": {
       "baseline": "3.1.0",
@@ -6972,6 +6972,10 @@
       "baseline": "2021-04-02",
       "port-version": 1
     },
+    "vcpkg-qmake": {
+      "baseline": "2021-10-23",
+      "port-version": 0
+    },
     "vcpkg-tool-nodejs": {
       "baseline": "14.17.4",
       "port-version": 0
diff --git a/versions/q-/qwt.json b/versions/q-/qwt.json
index 21451b5..34545e3 100644
--- a/versions/q-/qwt.json
+++ b/versions/q-/qwt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cbbcd74a4148208919161e2e3152d7d407f8869b",
+      "version-semver": "6.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e7204097fda082c43e704e356702fd77aa3c9a52",
       "version-semver": "6.2.0",

github-actions

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

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/qwt/vcpkg.json b/ports/qwt/vcpkg.json
index 96dca1b..862195e 100644
--- a/ports/qwt/vcpkg.json
+++ b/ports/qwt/vcpkg.json
@@ -5,16 +5,16 @@
   "description": "qt widgets library for technical applications",
   "homepage": "https://sourceforge.net/projects/qwt",
   "dependencies": [
-    {
-      "name": "vcpkg-qmake",
-      "host": true,
-      "default-features": false
-    },
     {
       "name": "qtbase",
       "default-features": false
     },
     "qtsvg",
-    "qttools"
+    "qttools",
+    {
+      "name": "vcpkg-qmake",
+      "host": true,
+      "default-features": false
+    }
   ]
-}
\ No newline at end of file
+}

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 2169ab765b49cfc5cd7eddfc8ff3e579326776f8 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 08c5a89..d426982 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5762,7 +5762,7 @@
     },
     "qwt": {
       "baseline": "6.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "qwtw": {
       "baseline": "3.1.0",
@@ -6972,6 +6972,10 @@
       "baseline": "2021-04-02",
       "port-version": 1
     },
+    "vcpkg-qmake": {
+      "baseline": "2021-10-23",
+      "port-version": 0
+    },
     "vcpkg-tool-nodejs": {
       "baseline": "14.17.4",
       "port-version": 0
diff --git a/versions/q-/qwt.json b/versions/q-/qwt.json
index 21451b5..34545e3 100644
--- a/versions/q-/qwt.json
+++ b/versions/q-/qwt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cbbcd74a4148208919161e2e3152d7d407f8869b",
+      "version-semver": "6.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e7204097fda082c43e704e356702fd77aa3c9a52",
       "version-semver": "6.2.0",

Neumann-A · 2021-10-25T10:58:56Z

@MehdiChinoune could you fix the static build issues? It seems like your dependencies in vcpkg.json are incorrect which is why CI fails here. (I was able to build it locally successfully).

MehdiChinoune · 2021-10-25T11:24:27Z

@MehdiChinoune could you fix the static build issues? It seems like your dependencies in vcpkg.json are incorrect which is why CI fails here. (I was able to build it locally successfully).

The dependencies are the same as before, I have just replaced the qt5-* with qt* .
You Could ignore qwt for now, It has Its own PR #20921

Neumann-A · 2021-10-25T11:32:29Z

The dependencies are the same as before, I have just replaced the qt5-* with qt* .

qt6 has a lot more features than qt5 which are off by default.

Neumann-A · 2021-10-25T11:34:45Z

cc @strega-nil-ms please check scripts for cmake guidelines
cc @ras0219-msft please check if the vcpkg-port-config.cmake is the correct way to chain port configs without requiring an explicit dependencies in dependent ports.

JackBoosY · 2021-10-27T02:41:22Z

Can this replace my PR #20322?

Neumann-A · 2021-10-27T06:46:38Z

Can this replace my PR #20322?

No, this PR is only about Qt6 and not Qt5. You could copy the code over and change it to use Qt5 though.

… vcpkg-qmake # Conflicts: # versions/q-/qtbase.json

github-actions

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

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for qtbase but no changes to version or port version.
-- Version: 6.2.1
-- Old SHA: 85405a7d213571f8da152112d436292099c5a4ab
-- New SHA: 5a3585832a53ae3c6dda810dc921e9ff33fde98c
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

MehdiChinoune · 2021-11-16T16:49:51Z

Any news?

ports/vcpkg-qmake/vcpkg-port-config.cmake

ports/vcpkg-qmake/vcpkg.json

ras0219-msft · 2021-11-17T13:31:23Z

ports/vcpkg-qmake/copyright

@@ -0,0 +1,23 @@
+Copyright (c) Microsoft Corporation


We may want to just provide a file that says "This helper port is part of vcpkg and is under the vcpkg license terms" instead of a duplicate license.

this is just copied over from vcpkg-cmake. I don't even now why you require this for the vcpkg scripts. (just touch the file vcpkg-tool wants to see)

ras0219-msft · 2021-11-17T13:33:17Z

ports/vcpkg-qmake/vcpkg.json

+  "dependencies": [
+    {
+      "name": "pkgconf",
+      "host": true,


It might make sense to make all these dependencies non-host and require this port to always be natively compiled. Then, you know you can use relative paths for host dependencies and ${CURRENT_INSTALLED_DIR} for target dependencies.

the command paths still need to be absolute. (Or i need to calculate the relative path from the working dir to the executable - wherever that might be.)

ras0219-msft · 2021-11-17T13:35:00Z

ports/vcpkg-qmake/vcpkg_qmake_configure.cmake

+include_guard(GLOBAL)
+function(vcpkg_qmake_configure)
+    cmake_parse_arguments(PARSE_ARGV 0 arg "" "SOURCE_PATH" "QMAKE_OPTIONS;QMAKE_OPTIONS_RELEASE;QMAKE_OPTIONS_DEBUG;OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG")
+


Assuming the dependencies are converted to native dependencies, it might make sense to calculate a "QMAKE_HOST_DIR" from ${CMAKE_CURRENT_LIST_DIR} and use that for all host dependencies in this function.

I don't get the added benefit of that. CURRENT_HOST_INSTALLED_DIR and QMAKE_HOST_DIR will point to the same directory however it is calculated

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

github-actions

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

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for vcpkg-qmake but no changes to version or port version.
-- Version: 2021-10-23
-- Old SHA: 2cd969cb31fe15b86008720c8539be521f07e1c6
-- New SHA: 98523aed5a3e3367fee4e5d54fc663da90e76dbc
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

JackBoosY · 2021-11-23T06:26:29Z

Ping @ras0219-msft for response.

ras0219-msft · 2021-11-23T19:41:41Z

LGTM, thanks for making the changes!

add vcpkg-qmake

9b3abf4

Neumann-A commented Oct 24, 2021

View reviewed changes

ports/vcpkg-qmake/vcpkg_qmake_configure.cmake Show resolved Hide resolved

Neumann-A mentioned this pull request Oct 24, 2021

[vcpkg_configure_qmake] update to use qmake from Qt6 #20935

Closed

add missing ,

fd16572

Neumann-A force-pushed the vcpkg-qmake branch from ccc0fed to fd16572 Compare October 24, 2021 13:03

format manifest

81257a2

github-actions bot requested changes Oct 24, 2021

View reviewed changes

This comment has been minimized.

Sign in to view

fix silly $( mistake

550ce76

github-actions bot requested changes Oct 24, 2021

View reviewed changes

fix syntax issues

485c6cf

MehdiChinoune reviewed Oct 24, 2021

View reviewed changes

ports/vcpkg-qmake/vcpkg_qmake_configure.cmake Outdated Show resolved Hide resolved

PhoebeHui assigned JackBoosY Oct 24, 2021

MehdiChinoune reviewed Oct 25, 2021

View reviewed changes

ports/vcpkg-qmake/vcpkg_qmake_configure.cmake Outdated Show resolved Hide resolved

MehdiChinoune reviewed Oct 25, 2021

View reviewed changes

ports/vcpkg-qmake/vcpkg_qmake_configure.cmake Outdated Show resolved Hide resolved

MehdiChinoune reviewed Oct 25, 2021

View reviewed changes

ports/vcpkg-qmake/vcpkg_qmake_configure.cmake Outdated Show resolved Hide resolved

MehdiChinoune reviewed Oct 25, 2021

View reviewed changes

ports/vcpkg-qmake/vcpkg_qmake_configure.cmake Outdated Show resolved Hide resolved

Neumann-A added 3 commits October 25, 2021 08:01

fix if since cmake port seems to b e out of sync

4063877

add qwt test port

a82d2d5

wip transfer commit

a995150

github-actions bot requested changes Oct 25, 2021

View reviewed changes

fix remaining issues. add docs.

6b13b87

github-actions bot requested changes Oct 25, 2021

View reviewed changes

JackBoosY requested a review from strega-nil-ms October 27, 2021 07:13

JackBoosY added the requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. label Oct 27, 2021

Neumann-A added 2 commits November 5, 2021 09:32

Merge branch 'vcpkg-qmake' of https://github.com/Neumann-A/vcpkg into…

4497c58

… vcpkg-qmake # Conflicts: # versions/q-/qtbase.json

version stuff

02a964a

github-actions bot requested changes Nov 5, 2021

View reviewed changes

revert changes to qtbase

5eea85a

github-actions bot approved these changes Nov 5, 2021

View reviewed changes

JackBoosY added the category:new-port The issue is requesting a new library to be added; consider making a PR! label Nov 8, 2021

JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Nov 17, 2021

ras0219-msft reviewed Nov 17, 2021

View reviewed changes

JackBoosY added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. labels Nov 18, 2021

make vcpkg-cmake a direct dependency

052f2f9

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

github-actions bot requested changes Nov 18, 2021

View reviewed changes

Neumann-A added 5 commits November 18, 2021 10:26

Merge remote-tracking branch 'upstream/master' into vcpkg-qmake

91e899a

add supports native. remove host deps.

e5a34af

remove comment

18cde51

format manifest

371e176

overwrite version

f6b0b67

github-actions bot approved these changes Nov 18, 2021

View reviewed changes

MehdiChinoune mentioned this pull request Nov 23, 2021

[qwt-qt6] new port #20921

Merged

JackBoosY removed the requires:author-response label Nov 23, 2021

ras0219-msft merged commit 64e658f into microsoft:master Nov 23, 2021

Neumann-A deleted the vcpkg-qmake branch November 23, 2021 20:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add vcpkg-qmake for qt6 #20963

add vcpkg-qmake for qt6 #20963

Neumann-A commented Oct 24, 2021 •

edited

Loading

github-actions bot left a comment

This comment has been minimized.

Neumann-A commented Oct 24, 2021

github-actions bot left a comment

MehdiChinoune commented Oct 24, 2021

JackBoosY commented Oct 25, 2021

github-actions bot left a comment

github-actions bot left a comment

Neumann-A commented Oct 25, 2021

MehdiChinoune commented Oct 25, 2021

Neumann-A commented Oct 25, 2021

Neumann-A commented Oct 25, 2021

JackBoosY commented Oct 27, 2021

Neumann-A commented Oct 27, 2021

github-actions bot left a comment

MehdiChinoune commented Nov 16, 2021

ras0219-msft Nov 17, 2021

Neumann-A Nov 18, 2021

ras0219-msft Nov 17, 2021

Neumann-A Nov 18, 2021 •

edited

Loading

ras0219-msft Nov 17, 2021

Neumann-A Nov 18, 2021

github-actions bot left a comment

JackBoosY commented Nov 23, 2021

ras0219-msft commented Nov 23, 2021

add vcpkg-qmake for qt6 #20963

add vcpkg-qmake for qt6 #20963

Conversation

Neumann-A commented Oct 24, 2021 • edited Loading

github-actions bot left a comment

Choose a reason for hiding this comment

This comment has been minimized.

Neumann-A commented Oct 24, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

MehdiChinoune commented Oct 24, 2021

JackBoosY commented Oct 25, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

Neumann-A commented Oct 25, 2021

MehdiChinoune commented Oct 25, 2021

Neumann-A commented Oct 25, 2021

Neumann-A commented Oct 25, 2021

JackBoosY commented Oct 27, 2021

Neumann-A commented Oct 27, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

MehdiChinoune commented Nov 16, 2021

ras0219-msft Nov 17, 2021

Choose a reason for hiding this comment

Neumann-A Nov 18, 2021

Choose a reason for hiding this comment

ras0219-msft Nov 17, 2021

Choose a reason for hiding this comment

Neumann-A Nov 18, 2021 • edited Loading

Choose a reason for hiding this comment

ras0219-msft Nov 17, 2021

Choose a reason for hiding this comment

Neumann-A Nov 18, 2021

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

JackBoosY commented Nov 23, 2021

ras0219-msft commented Nov 23, 2021

Neumann-A commented Oct 24, 2021 •

edited

Loading

Neumann-A Nov 18, 2021 •

edited

Loading