[jkqtplotter] Fix Qt version selection (microsoft#35319)

Cheney-W · Nov 27, 2023 · 13c3c0f · 13c3c0f
1 parent cd5e746
commit 13c3c0f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/ports/jkqtplotter/portfile.cmake b/ports/jkqtplotter/portfile.cmake
@@ -26,7 +26,7 @@ vcpkg_cmake_configure(
         -DJKQtPlotter_BUILD_SHARED_LIBS=${JKQtPlotter_BUILD_SHARED_LIBS}
         -DJKQtPlotter_BUILD_STATIC_LIBS=${JKQtPlotter_BUILD_STATIC_LIBS}
         ${FEATURE_OPTIONS}
-        -DQT_VERSION_MAJOR=6
+        -DCMAKE_IGNORE_PATH=${CURRENT_INSTALLED_DIR}/share/cmake/Qt5
         -DCIMG_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
         -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV:BOOL=ON # only used for some examples
         -DOpenCV_FOUND:BOOL=FALSE # wrong find_package call with QUITE instead of QUIET

diff --git a/ports/jkqtplotter/vcpkg.json b/ports/jkqtplotter/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "jkqtplotter",
   "version-date": "2023-10-24",
+  "port-version": 1,
   "description": "A Qt Plotting Library",
   "license": null,
   "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3634,7 +3634,7 @@
     },
     "jkqtplotter": {
       "baseline": "2023-10-24",
-      "port-version": 0
+      "port-version": 1
     },
     "joltphysics": {
       "baseline": "4.0.0",

diff --git a/versions/j-/jkqtplotter.json b/versions/j-/jkqtplotter.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c6818df9457df540c1c0fd88b1ff2da3c844c8fa",
+      "version-date": "2023-10-24",
+      "port-version": 1
+    },
     {
       "git-tree": "87ffb0cb05a71f4338bd068bc14a348770b7d4ff",
       "version-date": "2023-10-24",